diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/nav.php | 4 | ||||
| -rw-r--r-- | mod/directory.php | 4 | ||||
| -rw-r--r-- | mod/photos.php | 4 | ||||
| -rw-r--r-- | mod/profiles.php | 4 | ||||
| -rw-r--r-- | util/messages.po | 12 | ||||
| -rw-r--r-- | view/theme/slackr/style.css | 15 |
7 files changed, 30 insertions, 15 deletions
@@ -10,7 +10,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1376' ); +define ( 'FRIENDICA_VERSION', '3.0.1377' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1149 ); diff --git a/include/nav.php b/include/nav.php index 909ba9b54..d760cc8ae 100644 --- a/include/nav.php +++ b/include/nav.php @@ -53,9 +53,9 @@ function nav(&$a) { $nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); // user info - $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); + $r = q("SELECT `micro`,`avatar-date` FROM `contact` WHERE uid=%d AND self=1", intval($a->user['uid'])); $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl($ssl_state)."/images/person-48.jpg"), + 'icon' => (count($r) ? $r[0]['micro']."?rev=".urlencode($r[0]['avatar-date']): $a->get_baseurl($ssl_state)."/images/person-48.jpg"), 'name' => $a->user['username'], ); diff --git a/mod/directory.php b/mod/directory.php index 367438845..7f3a44ff4 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -73,7 +73,7 @@ function directory_content(&$a) { $order = " ORDER BY `name` ASC "; - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` 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 ", + $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `contact`.`avatar-date` AS picdate, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `self` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", intval($a->pager['start']), intval($a->pager['itemspage']) ); @@ -116,7 +116,7 @@ function directory_content(&$a) { $entry = replace_macros($tpl,array( '$id' => $rr['id'], '$profile-link' => $profile_link, - '$photo' => $rr[$photo], + '$photo' => $rr[$photo] . '?rev=' . urlencode($rr['picdate']), '$alt-text' => $rr['name'], '$name' => $rr['name'], '$details' => $pdesc . $details diff --git a/mod/photos.php b/mod/photos.php index efeab8fa3..a6552994e 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -16,7 +16,7 @@ function photos_init(&$a) { if($a->argc > 1) { $nick = $a->argv[1]; - $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", + $r = q("SELECT `user`.*, `contact`.`avatar-date` AS picdate FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 LIMIT 1", dbesc($nick) ); @@ -36,7 +36,7 @@ function photos_init(&$a) { $o .= '<div class="vcard">'; $o .= '<div class="fn">' . $a->data['user']['username'] . '</div>'; - $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg" alt="' . $a->data['user']['username'] . '" /></div>'; + $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg?rev=' . urlencode($a->data['user']['picdate']) . '" alt="' . $a->data['user']['username'] . '" /></div>'; $o .= '</div>'; if(! intval($a->data['user']['hidewall'])) { diff --git a/mod/profiles.php b/mod/profiles.php index 6a8ce9e1e..7b6e61ad6 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -635,7 +635,7 @@ function profiles_content(&$a) { } else { - $r = q("SELECT * FROM `profile` WHERE `uid` = %d", + $r = q("SELECT `profile`.*, `contact`.`avatar-date` AS picdate FROM `profile` LEFT JOIN `contact` on `contact`.`uid` = `profile`.`uid` WHERE `profile`.`uid` = %d and contact.self = 1", local_user()); if(count($r)) { @@ -652,7 +652,7 @@ function profiles_content(&$a) { foreach($r as $rr) { $o .= replace_macros($tpl, array( - '$photo' => $rr['thumb'], + '$photo' => $rr['thumb'] . '?rev=' . urlencode($rr['picdate']), '$id' => $rr['id'], '$alt' => t('Profile Image'), '$profile_name' => $rr['profile-name'], diff --git a/util/messages.po b/util/messages.po index 1de0fe3a3..152940341 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1376\n" +"Project-Id-Version: 3.0.1377\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-16 10:00-0700\n" +"POT-Creation-Date: 2012-06-17 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -408,7 +408,7 @@ msgstr "" #: ../../mod/photos.php:587 ../../mod/like.php:185 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316 -#: ../../include/diaspora.php:1671 ../../include/conversation.php:53 +#: ../../include/diaspora.php:1709 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" msgstr "" @@ -2777,7 +2777,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1671 +#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1709 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" @@ -2785,7 +2785,7 @@ msgstr "" #: ../../mod/like.php:202 ../../addon/facebook/facebook.php:1580 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1687 +#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1725 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -6609,7 +6609,7 @@ msgstr "" msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:2037 +#: ../../include/diaspora.php:2074 msgid "Attachments:" msgstr "" diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css index 8a8f8c726..d8801421e 100644 --- a/view/theme/slackr/style.css +++ b/view/theme/slackr/style.css @@ -59,6 +59,8 @@ nav #site-location { -moz-border-radius: 3px; opacity: 0.3; filter:alpha(opacity=30); + margin-left: 5px; + margin-top: 5px; } #events-reminder.birthday-today, #events-reminder.event-today { @@ -71,6 +73,8 @@ nav #site-location { opacity: 1.0; filter:alpha(opacity=100); box-shadow: 4px 4px 3px 0 #444444; + margin-left: 0px; + margin-top: 0px; } .fc-event-skin { @@ -101,6 +105,17 @@ nav #site-location { filter:alpha(opacity=100); } +#posted-date-selector { + margin-left: 30px !important; + margin-top: 5px !important; +} + + +#posted-date-selector:hover { + box-shadow: 4px 4px 3px 0 #444444; + margin-left: 25px !important; + margin-top: 0px !important; +} .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected { border-radius: 3px; |