diff --git a/mod/photos.php b/mod/photos.php index 4c52c7ef7..06c566f47 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -855,16 +855,14 @@ function photos_content(&$a) { $tools = array( 'profile'=>array($a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource_id'], t('Use as profile photo')), ); - - // lock - $lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) - || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) - ? t('Private Message') - : Null); - - } + // lock + $lock = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) + || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) + ? t('Private Photo') + : Null); + $a->page['htmlhead'] .= ''; if($prevlink) - $prevlink = array($prevlink, '') ; + $prevlink = array($prevlink, t('Previous')); $photo = array( 'href' => $a->get_baseurl() . '/photo/' . $hires['resource_id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']], @@ -882,7 +880,7 @@ function photos_content(&$a) { ); if($nextlink) - $nextlink = array($nextlink, ''); + $nextlink = array($nextlink, t('Next')); // Do we have an item for this photo? @@ -1122,6 +1120,8 @@ function photos_content(&$a) { '$prevlink' => $prevlink, '$nextlink' => $nextlink, '$desc' => $ph[0]['description'], + '$filename' => $ph[0]['filename'], + '$unknown' => t('Unknown'), '$tag_hdr' => t('In This Photo:'), '$tags' => $tags, '$edit' => $edit, diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 5f8ed6124..571aba57c 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -3,19 +3,14 @@ margin-bottom: 25px; } -#photo-view-wrapper { - float:left; - min-width: 500px; - overflow: hidden; -} - -#photo-prev-link, #photo-next-link { - padding: 10px; - float: left; +.photo-item-tools-left, +.photo-item-tools-right { + padding: 7px 10px; } #photo-photo { - float: left; + display: table; + margin: 0 auto; } #photo-photo-end { @@ -82,9 +77,6 @@ #photo-edit-link-wrap { margin-bottom: 15px; } -#photo-like-div { - margin-bottom: 25px; -} #photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end { clear: both; @@ -94,18 +86,10 @@ margin-bottom: 15px; } -#photo-edit-delete-button { - float: right; -} -#photo-edit-edit-wrapper { - margin-top: 10px; - margin-bottom: 30px; -} - -#photo-photo-delete-button { - float: right; - margin-top: -64px; +#photo-edit-edit { + padding: 7px 10px; + margin-bottom: 3px; } #photo-edit-end { @@ -116,16 +100,6 @@ margin-bottom: 15px; } -#in-this-photo-text { - margin-left: 30px; -} - -#in-this-photo { - margin-left: 60px; - margin-top: 10px; - margin-bottom: 20px; -} - #photo-album-edit-submit, #photo-album-edit-drop { margin-top: 15px; margin-bottom: 15px; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c448c877f..be2eb05ae 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -648,7 +648,7 @@ footer { list-style: none; } -.profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { +.profile-match-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; @@ -704,16 +704,11 @@ footer { cursor: pointer; } -#photo-caption { - font-size: 110%; - font-weight: bold; +#photo-view-wrapper, +#photo-edit-edit { + background-color: $item_colour; } -#in-this-photo-text { - color: #0080FF; -} - - #side-follow-wrapper { margin-top: 20px; } @@ -2327,8 +2322,9 @@ aside .nav-pills > li > a { .section-title-wrapper { padding: 7px 10px; background-color: $item_colour; - border-radius: $radiuspx; - margin-bottom: 10px; + border-top-left-radius: $radiuspx; + border-top-right-radius: $radiuspx; + margin-bottom: 3px; } .section-title-wrapper h2 { diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 4961464dc..ddbce5b0b 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,114 +1,122 @@
-
-

{{$album.1}}

+
-