[dw-free] Subscription/Access Icons Should Reflect Circle Status

[afuna]

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

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

Use access_remove.png and subscription_remove.png if you're watching/have
trusted this journal.

Patch by yvi.

Files modified:

• cgi-bin/DW/Logic/UserLinkBar.pm

--------------------------------------------------------------------------------
diff -r 14c8cc214a3a -r 5da67ac66a96 cgi-bin/DW/Logic/UserLinkBar.pm
--- a/cgi-bin/DW/Logic/UserLinkBar.pm	Thu Jun 18 13:52:35 2009 +0000
+++ b/cgi-bin/DW/Logic/UserLinkBar.pm	Thu Jun 18 14:13:55 2009 +0000
@@ -200,7 +200,11 @@ sub trust {
             $link->{url} = "manage/circle/add.bml?user=$user&action=access";
             $link->{title_ml} = $remote_trusts ? 'userlinkbar.modifytrust.title.other' : 'userlinkbar.addtrust.title.other';
             $link->{class} = "addtrust";
-            $link->{image} = 'access_grant.png';
+            if ( $remote_trusts ) {
+                $link->{image} = 'access_remove.png';
+            } else {
+                $link->{image} = 'access_grant.png';
+            }
         } else {
             $link->{title_ml} = 'userlinkbar.addtrust.title.loggedout';
             $link->{class} = "addtrust_disabled";
@@ -239,13 +243,25 @@ sub watch {
 
         if ( $u->is_community ) {
             $link->{class} = "addsub_comm";
-            $link->{image} = 'subscription_add.png';
+            if ( $remote_watches ) {
+                $link->{image} = 'subscription_remove.png';
+            } else {
+                $link->{image} = 'subscription_add.png';
+            }
         } elsif ( $u->is_syndicated ) {
             $link->{class} = "addsub_feed";
-            $link->{image} = 'subscription_add.png';
+            if ( $remote_watches ) {
+                $link->{image} = 'subscription_remove.png';
+            } else {
+                $link->{image} = 'subscription_add.png';
+            }
         } else {
             $link->{class} = "addsub_person";
-            $link->{image} = 'subscription_add.png';
+            if ( $remote_watches ) {
+                $link->{image} = 'subscription_remove.png';
+            } else {
+                $link->{image} = 'subscription_add.png';
+            }
         }
     } else {
         $link->{title_ml} = 'userlinkbar.addsub.title.loggedout';
--------------------------------------------------------------------------------