Савинцев Егор 🚶 (savintsev_egor) wrote in changelog,
Савинцев Егор 🚶
savintsev_egor
changelog

[livejournal] r19180: LJSUP-8920: Friends by Tags

Committer: esavintcev
LJSUP-8920: Friends by Tags
U   trunk/htdocs/friends/add.bml
Modified: trunk/htdocs/friends/add.bml
===================================================================
--- trunk/htdocs/friends/add.bml	2011-05-31 07:15:16 UTC (rev 19179)
+++ trunk/htdocs/friends/add.bml	2011-05-31 09:01:12 UTC (rev 19180)
@@ -152,13 +152,17 @@
  if ($fr) {
      $title .= $ML{'.error3.title'};
      if ($u->is_visible) {
+         $body .= '<div class="b-addfriend-aside">';
          $body .= '<div class="b-addfriend-status">';
          $body .= "<?p " . BML::ml('.error3.text1', {'user' => LJ::ljuser($user)}) . " p?>";
          $body .= "</div>";
+         $body .= "</div>";
      } else {
+         $body .= '<div class="b-addfriend-aside">';
          $body .= '<div class="b-addfriend-status">';
          $body .= "<?p " . BML::ml('.error3.text2', {'user' => LJ::ljuser($user)}) . " p?>";
          $body .= "</div>";
+         $body .= "</div>";
      }
  } else {
      # return an error if user being added isn't visible
@@ -172,9 +176,12 @@
      if ($u->{journaltype} eq 'Y') {
          $windowtitle = BML::ml('.confirm.syn.title1', {'user'=> $user });
          $title = BML::ml('.confirm.syn.title1', {'icon'=> $icon, 'user'=> $user });
+         $body .= '<div class="b-addfriend-aside">';
          $body .= '<div class="b-addfriend-status">';
          $body .= "<?p $ML{'.confirm.text1.feed'} p?>";
          $body .= "</div>";
+         $body .= LJ::get_ads({ location => 'bml.friends.add/main', ljadwrapper => 1, });
+         $body .= "</div>";
 
      # Is this account redirected?
      } elsif ($u->{'journaltype'} eq "R" && $u->prop('renamedto')) {
@@ -184,16 +191,22 @@
          $windowtitle = BML::ml('.confirm.title.community', {'user'=> $user });
          $title = BML::ml('.confirm.title.community', {'icon'=> $icon, 'user'=> $user });
          unless (LJ::is_friend($userid, $remote->{userid})) {
+             $body .= '<div class="b-addfriend-aside">';
              $body .= '<div class="b-addfriend-status">';
              $body .= "<?p " . BML::ml('.confirm.text1.community2', {'aopts' => "href='$LJ::SITEROOT/community/join.bml?comm=$user'"}) . " p?>";
              $body .= "</div>";
+             $body .= LJ::get_ads({ location => 'bml.friends.add/main', ljadwrapper => 1, });
+             $body .= "</div>";
          }
      } elsif ($u->{'journaltype'} eq "N") {
          $windowtitle = BML::ml('.confirm.title.news', {'user'=> $user });
          $title = BML::ml('.confirm.title.news', {'icon'=> $icon, 'user'=> $user });
+         $body .= '<div class="b-addfriend-aside">';
          $body .= '<div class="b-addfriend-status">';
          $body .= "<?p " . BML::ml('.confirm.text1.news', {'user' => LJ::ljuser($user)}) . " p?>";
          $body .= "</div>";
+         $body .= LJ::get_ads({ location => 'bml.friends.add/main', ljadwrapper => 1, });
+         $body .= "</div>";
 
      } else {
          if ($u->{'journaltype'} eq "I") {
@@ -203,16 +216,18 @@
             $windowtitle = BML::ml('.confirm.title.person', {'user'=> $user });
             $title = BML::ml('.confirm.title.person', {'icon'=> $icon, 'user'=> $user });
          }
+         $body .= '<div class="b-addfriend-aside">';
          $body .= '<div class="b-addfriend-status">';
          $body .= "<?p $ML{'.confirm.text1.person'}";
          $body .= "<ul><li>$ML{'.confirm.action1.person'}</li>";
          $body .= "<li>$ML{'.confirm.action2.person'}</li>" if ($u->{'journaltype'} ne "I");
          $body .= "</ul> p?>";
          $body .= "</div>";
+         $body .= LJ::get_ads({ location => 'bml.friends.add/main', ljadwrapper => 1, });
+         $body .= '</div>';
      }
  }
 
- $body .= LJ::get_ads({ location => 'bml.friends.add/main', ljadwrapper => 1, });
 
  $body .= '<div class="b-addfriend-main">';
 
@@ -586,7 +601,6 @@
  $body .= "</form>";
  $body .= '</div>';
  $body .= '</div>';
- # $body = $print_with_ad->($body);
  
  return;
 

Tags: bml, livejournal, savintsev_egor
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