wisest owl (wisest_owl) wrote in changelog,
wisest owl
wisest_owl
changelog

[ljcom] r9363: LJSUP-6532. Error Pages Improvements

Committer: gprochaev
LJSUP-6532. Error Pages Improvements

1. add ?\194?\171Recent Entries?\194?\187 link
2. update suspended entry in the system pages template

U   trunk/htdocs/error-page.bml
U   trunk/htdocs/error-page.bml.text
Modified: trunk/htdocs/error-page.bml
===================================================================
--- trunk/htdocs/error-page.bml	2010-08-20 04:24:21 UTC (rev 9362)
+++ trunk/htdocs/error-page.bml	2010-08-20 06:45:23 UTC (rev 9363)
@@ -11,6 +11,7 @@
 ## baduser      => not exist journals
 ## readonly     => read only
 ## suspended    => suspended journals
+## suspended_post => suspended posts
 ## deleted      => deleted journals
 ## expunged     => expunged journals
 ## forfriends   => only for friends
@@ -78,6 +79,15 @@
     push @links, LJ::Lang::ml('.errorpage.baduser.link.faq', { aopts => "href='$LJ::SITEROOT/support/faq.bml'" });
     push @links, LJ::Lang::ml('.errorpage.not_found.link.site_map',  { aopts => "href='$LJ::SITEROOT/site/'" });
     $ad_html = LJ::get_ads( { location => 'error_page.baduser', journalu => $remote } );
+} elsif ($error_type eq 'suspended_post') {
+    $frank_img = "/frank-suspend.png";
+    $title = LJ::Lang::ml('.errorpage.suspended_post.title');
+    $description = LJ::Lang::ml('.errorpage.suspended_post.description.alien', { username => $user } );
+    $user = LJ::load_user ($user);
+    push @links, LJ::Lang::ml('.errorpage.recent_entries', { aopts => "href='".$user->journal_base."'" } ) if $user;
+    push @links, LJ::Lang::ml('.errorpage.suspend_post.link.faq', { aopts => "href='$LJ::SITEROOT/support/faqbrowse.bml?faqid=106'" });
+    push @links, LJ::Lang::ml('.errorpage.not_found.link.site_map',  { aopts => "href='$LJ::SITEROOT/site/'" });
+    $ad_html = LJ::get_ads( { location => 'error_page.suspended', journalu => $remote } );
 } elsif ($error_type eq 'suspended') {
     $frank_img = "/frank-suspend.png";
     $title = LJ::Lang::ml('.errorpage.suspended.title');
@@ -109,8 +119,9 @@
     $frank_img = "/frank-private.png";
     $title = LJ::Lang::ml('.errorpage.private.title');
     $description = LJ::Lang::ml('.errorpage.private.description', { username => $user } );
+    $user = LJ::load_user ($user);
+    push @links, LJ::Lang::ml('.errorpage.recent_entries', { aopts => "href='".$user->journal_base."'" } ) if $user;
     push @links, LJ::Lang::ml('.errorpage.private.link.faq', { aopts => "href='$LJ::SITEROOT/support/faqbrowse.bml?faqid=24'" });
-    $user = LJ::load_user ($user);
     push @links, LJ::Lang::ml('.errorpage.private.link.lastentries', { aopts => "href='".$user->journal_base."'" }) if $user;
     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 } );

Modified: trunk/htdocs/error-page.bml.text
===================================================================
--- trunk/htdocs/error-page.bml.text	2010-08-20 04:24:21 UTC (rev 9362)
+++ trunk/htdocs/error-page.bml.text	2010-08-20 06:45:23 UTC (rev 9363)
@@ -28,6 +28,8 @@
 
 .errorpage.not_found.link.site_map=<a [[aopts]]>Site map</a>
 
+.errorpage.recent_entries=<a [[aopts]]>Recent Entries</a> of this journal
+
 .errorpage.suspended.title=Suspended Journal
 
 .errorpage.suspended.description.owner=Your journal has been suspended, all posts of this journal are not available for reading.
@@ -36,6 +38,12 @@
 
 .errorpage.suspend.link.faq=<a [[aopts]]>Learn about suspended journals</a>
 
+.errorpage.suspended_post.title=Suspended Entry
+
+.errorpage.suspended_post.description.alien=This entry has been suspended and not available for reading. For confidentiality reasons we can not discuss the reasons for which the entry was frozen, with someone else other than the account holder.
+
+.errorpage.suspend_post.link.faq=<a [[aopts]]>Learn about suspended journals</a>
+
 .errorpage.deleted.title=Deleted Account
 
 .errorpage.deleted.description.owner=Your journal has been deleted. You have a period of [[ndays]] days <a [[aopts]]>to undelete the journal</a>. After this time all content of your journal will be deleted from LiveJournal server.

Tags: bml, ljcom, text, wisest-owl
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments