[dw-free] user-tag /manage/circle/add.bml

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/f00ab7d12a40]

http://bugs.dwscoalition.org/show_bug.cgi?id=627

Use a user tag (instead of an unlinked icon and username) in the title of
the page when adding a journal to your circle; assorted cleanup.

Patch by yvi.

Files modified:

• cgi-bin/LJ/User.pm
• htdocs/manage/circle/add.bml
• htdocs/manage/circle/add.bml.text

--------------------------------------------------------------------------------
diff -r e0ff4a456c2b -r f00ab7d12a40 cgi-bin/LJ/User.pm
--- a/cgi-bin/LJ/User.pm	Thu Dec 17 14:26:01 2009 +0000
+++ b/cgi-bin/LJ/User.pm	Thu Dec 17 14:43:41 2009 +0000
@@ -2725,7 +2725,7 @@ sub ljuser_display {
         my ($imgurl, $width, $height);
         my $head_size = $opts->{head_size};
         if ($head_size) {
-            $imgurl = "$img/openid_${head_size}.gif";
+            $imgurl = "$img/silk/${head_size}/openid.png";
             $width = $head_size;
             $height = $head_size;
         } else {
@@ -6828,18 +6828,21 @@ sub ljuser
         if ( $u->get_cap( 'staff_headicon' ) ) {
             return $make_tag->( 'comm_staff.png', $url, 16, '', 'site community' );
         } else {
-            return $make_tag->( "comm_${head_size}.gif", $url, $head_size, '', $type_readable ) if $head_size;
+            return $make_tag->( "silk/${head_size}/community.png", $url, $head_size, '', $type_readable ) if $head_size;
             return $make_tag->( 'silk/identity/community.png', $url, 16, '', $type_readable );
         }
     } elsif ( $type eq 'Y' ) {
+        return $make_tag->( "silk/${head_size}/feed.png", $url, $head_size, '', $type_readable ) if $head_size;
         return $make_tag->( 'silk/identity/feed.png', $url, 16, '', $type_readable );
     } elsif ( $type eq 'I' ) {
         return $u->ljuser_display($opts);
     } else {
         if ( $u->get_cap( 'staff_headicon' ) ) {
+            return $make_tag->( "silk/${head_size}/user_staff.png", $url, $head_size, '', $type_readable ) if $head_size;
             return $make_tag->( 'silk/identity/user_staff.png', $url, 17, '', 'staff' );
         }
         else {
+            return $make_tag->( "silk/${head_size}/user.png", $url, $head_size, '', $type_readable ) if $head_size;
             return $make_tag->( 'silk/identity/user.png', $url, 17, '', $type_readable );
         }
     }
diff -r e0ff4a456c2b -r f00ab7d12a40 htdocs/manage/circle/add.bml
--- a/htdocs/manage/circle/add.bml	Thu Dec 17 14:26:01 2009 +0000
+++ b/htdocs/manage/circle/add.bml	Thu Dec 17 14:43:41 2009 +0000
@@ -151,8 +151,8 @@
     if ( $u->is_visible ) {
         # was this a syndicated add?
         if ( $u->is_syndicated ) {
-            $windowtitle = BML::ml('.confirm.syn.title1'.$add, {'user'=> $user });
-            $title = BML::ml('.confirm.syn.title1'.$add, {'icon'=> $icon, 'user'=> $user });
+            $windowtitle = BML::ml( '.confirm.title.syn2'.$add, { user => $user } );
+            $title = BML::ml( '.confirm.title.syn2'.$add, { user=> LJ::ljuser( $u, { head_size => "24x24" } ) } );
             $body .= "<?p $ML{'.confirm.text1.feed'} p?>";
 
         # Is this account redirected?
@@ -160,8 +160,8 @@
             return BML::redirect("$LJ::SITEROOT/manage/circle/add?user=" . $u->prop('renamedto'));
 
         } elsif ( $u->is_community ) {
-            $windowtitle = BML::ml('.confirm.title.community'.$add, {'user'=> $user });
-            $title = BML::ml('.confirm.title.community'.$add, {'icon'=> $icon, 'user'=> $user });
+            $windowtitle = BML::ml( '.confirm.title.community2'.$add, { user => $user } );
+            $title = BML::ml('.confirm.title.community2'.$add, { user=> LJ::ljuser( $u, { head_size => "24x24" } ) } );
             unless ( $remote->member_of( $u ) ) {
                 if ( $remote->is_person ) {
                     $body .= "<?p " . BML::ml( '.confirm.text1.community2', {'aopts' => "href='$LJ::SITEROOT/community/join?comm=$user'"} ) . " p?>";
@@ -171,11 +171,11 @@
             }
         } else {
             if ( $u->is_identity ) {
-               $windowtitle = BML::ml('.confirm.title.person'.$add, {'user'=> $u->display_name });
-               $title = BML::ml('.confirm.title.person'.$add, {'icon'=> $icon, 'user'=> $u->display_name });
+               $windowtitle = BML::ml( '.confirm.title.person2'.$add, { user => $u->display_name } );
+               $title = BML::ml('.confirm.title.person2'.$add, { user => LJ::ljuser( $u, { head_size => "24x24" } ) } );
             } else {
-               $windowtitle = BML::ml('.confirm.title.person'.$add, {'user'=> $u->display_name });
-               $title = BML::ml('.confirm.title.person'.$add, {'icon'=> $icon, 'user'=> $u->display_name });
+               $windowtitle = BML::ml( '.confirm.title.person2'.$add, { user => $u->display_name } );
+               $title = BML::ml( '.confirm.title.person2'.$add, { user => LJ::ljuser( $u, { head_size => "24x24" } ) } );
             }
             $body .= "<?p $ML{'.confirm.text1.person'} p?>"
                 if $remote->can_trust( $u ) && $remote->can_watch( $u );
diff -r e0ff4a456c2b -r f00ab7d12a40 htdocs/manage/circle/add.bml.text
--- a/htdocs/manage/circle/add.bml.text	Thu Dec 17 14:26:01 2009 +0000
+++ b/htdocs/manage/circle/add.bml.text	Thu Dec 17 14:43:41 2009 +0000
@@ -44,10 +44,6 @@
 
 .colors.text=Select the colors that will represent [[user]] on your reading page (only applicable if you subscribe to them).
 
-.confirm.syn.title1=Modify [[icon]][[user]]'s subscription?
-
-.confirm.syn.title1.add=Subscribe to [[icon]][[user]]?
-
 .confirm.text=To add <b>[[user]]</b> to your friends list, click the button below.
 
 .confirm.text1.community2=Adding a community allows you to read the community's public posts on your reading page. If you would like to post to the community and be listed as a member, you'll need to <a [[aopts]]>join the community</a>.
@@ -60,13 +56,17 @@
 
 .confirm.text1.person=Choose one or both of the following:
 
-.confirm.title.community=Modify [[icon]][[user]]'s subscription?
+.confirm.title.community2=Modify subscription to [[user]]?
 
-.confirm.title.community.add=Subscribe to [[icon]][[user]]?
+.confirm.title.community2.add=Subscribe to [[user]]?
 
-.confirm.title.person=Modify [[icon]][[user]]'s status in your circle?
+.confirm.title.person2=Modify [[user]]'s status in your circle?
 
-.confirm.title.person.add=Add [[icon]][[user]] to your circle?
+.confirm.title.person2.add=Add [[user]] to your circle?
+
+.confirm.title.syn2=Modify subscription to [[user]]?
+
+.confirm.title.syn2.add=Subscribe to [[user]]?
 
 .disclaimer=This will not allow maintainers or members of the community to view your friends-only posts.
 
--------------------------------------------------------------------------------