Committer: gprochaev
merged with 'fotki' branchU trunk/bin/upgrading/proplists-local.dat U trunk/htdocs/error-page.bml U trunk/htdocs/error-page.bml.text
Modified: trunk/bin/upgrading/proplists-local.dat =================================================================== --- trunk/bin/upgrading/proplists-local.dat 2011-08-04 14:27:32 UTC (rev 10800) +++ trunk/bin/upgrading/proplists-local.dat 2011-08-05 07:06:12 UTC (rev 10801) @@ -759,3 +759,18 @@ datatype: bool des: Boolean: 1 - enable "Give" features in journal prettyname: Enable "Give" features + +userproplist.newest_foto_time: + cldversion: 8 + datatype: char + des: Time of the user's last photo/album edit + indexed: 0 + prettyname: Newest photo/album edit + +userproplist.default_album_id: + cldversion: 8 + datatype: char + des: Default ("Unsorted") album ID. After delete - recreate. + indexed: 0 + prettyname: Default album ID. + Modified: trunk/htdocs/error-page.bml =================================================================== --- trunk/htdocs/error-page.bml 2011-08-04 14:27:32 UTC (rev 10800) +++ trunk/htdocs/error-page.bml 2011-08-05 07:06:12 UTC (rev 10801) @@ -17,6 +17,7 @@ ## forfriends => only for friends ## custom => custom friends ## private => private (just me) +## private_photo => private photo (just me) ## members => only for community members BML::set_language_scope('/error-page.bml'); @@ -124,6 +125,16 @@ push @links, LJ::Lang::ml('.errorpage.expunged.link.faq', { aopts => "href='$LJ::SITEROOT/support/faqbrowse.bml?faqid=16'" }); push @links, LJ::Lang::ml('.errorpage.not_found.link.site_map', { aopts => "href='$LJ::SITEROOT/site/'" }); $ad_html = LJ::get_ads( { location => 'error_page.expunged', journalu => $remote } ); +} elsif ($error_type =~ /private_photo/) { + $frank_img = "/frank-private.png"; + $title = LJ::Lang::ml('.errorpage.private_photo.title'); + $description = LJ::Lang::ml('.errorpage.private_photo.description', { username => $user } ); + $user = LJ::load_user ($user); + push @links, LJ::Lang::ml('.errorpage.photo_catalog', { aopts => "href='".$user->journal_base."/pics/catalog'" } ) if $user && $user->statusvis eq 'V'; + push @links, LJ::Lang::ml('.errorpage.link.go_home', { aopts => "href='$LJ::SITEROOT'" }); + push @links, LJ::Lang::ml('.errorpage.private.link.faq', { aopts => "href='$LJ::SITEROOT/support/faqbrowse.bml?faqid=24'" }); + push @links, LJ::Lang::ml('.errorpage.not_found.link.site_map', { aopts => "href='$LJ::SITEROOT/site/'" }); + $ad_html = LJ::get_ads( { location => 'error_page.private', journalu => $remote } ); } elsif ($error_type =~ /forfriends|custom|private|members/) { $frank_img = "/frank-private.png"; $title = LJ::Lang::ml('.errorpage.private.title'); Modified: trunk/htdocs/error-page.bml.text =================================================================== --- trunk/htdocs/error-page.bml.text 2011-08-04 14:27:32 UTC (rev 10800) +++ trunk/htdocs/error-page.bml.text 2011-08-05 07:06:12 UTC (rev 10801) @@ -44,12 +44,18 @@ .errorpage.private.description=You have ho access to this entry. +.errorpage.private_photo.description=You have no access to this photo. + .errorpage.private.link.faq=<a [[aopts]]>Learn about Security entries</a> .errorpage.private.link.lastentries=<a [[aopts]]>Read resent entries</a> +.errorpage.photo_catalog=<a [[aopts]]>View more photos</a> + .errorpage.private.title=Access is closed! +.errorpage.private_photo.title=Access is closed! + .errorpage.recent_entries=<a [[aopts]]>Recent Entries</a> of this journal .errorpage.suspended.description.alien=This journal has been suspended, all posts of this journal are not available for reading. For confidentiality reasons we can not discuss the reasons for which the account was frozen, with someone else other than the account holder.