[dw-free] nav strip doesn't accurately show one-sided relationships

[afuna]

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

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

Make navstrip text accurately reflect one-sided relationships.

Patch by invisionary.

Files modified:

• bin/upgrading/en.dat
• cgi-bin/weblib.pl

--------------------------------------------------------------------------------
diff -r 4f0e414160b0 -r a485df11072b bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Thu Apr 09 16:46:50 2009 +0000
+++ b/bin/upgrading/en.dat	Thu Apr 09 17:21:45 2009 +0000
@@ -3399,6 +3399,10 @@ web.controlstrip.status.trust_watch=You 
 
 web.controlstrip.status.trust_watchedby=You have granted access to [[user]] and they have subscribed to you
 
+web.controlstrip.status.trusted=You have granted [[user]] access to your journal
+
+web.controlstrip.status.trustedby=You have been granted access to [[user]]'s journal
+
 web.controlstrip.status.trustedby_mutualwatch=[[user]] has granted access to you and you and they have mutual subscriptions
 
 web.controlstrip.status.trustedby_watch=[[user]] has granted access to you and you subscribe to them
@@ -3406,6 +3410,10 @@ web.controlstrip.status.trustedby_watche
 web.controlstrip.status.trustedby_watchedby=[[user]] has granted access and subscribes to you
 
 web.controlstrip.status.watcher=You are watching [[user]]
+
+web.controlstrip.status.watched=You have subscribed to [[user]]'s journal
+
+web.controlstrip.status.watchedby=[[user]] has subscribed to your journal
 
 web.controlstrip.status.yourjournal=You are viewing your journal
 
diff -r 4f0e414160b0 -r a485df11072b cgi-bin/weblib.pl
--- a/cgi-bin/weblib.pl	Thu Apr 09 16:46:50 2009 +0000
+++ b/cgi-bin/weblib.pl	Thu Apr 09 17:21:45 2009 +0000
@@ -2994,6 +2994,10 @@ sub control_strip
                     'memberwatcher'     => BML::ml('web.controlstrip.status.memberwatcher', {'user' => $journal_display}),
                     'watcher'           => BML::ml('web.controlstrip.status.watcher', {'user' => $journal_display}),
                     'member'            => BML::ml('web.controlstrip.status.member', {'user' => $journal_display}),
+                    'trusted'           => BML::ml('web.controlstrip.status.trusted', {'user' => $journal_display}),
+                    'watched'           => BML::ml('web.controlstrip.status.watched', {'user' => $journal_display}),
+                    'trusted_by'        => BML::ml('web.controlstrip.status.trustedby', {'user' => $journal_display}),
+                    'watched_by'        => BML::ml('web.controlstrip.status.watchedby', {'user' => $journal_display}),
                     );
     # Style the status text
     foreach my $key (keys %statustext) {
@@ -3122,6 +3126,18 @@ sub control_strip
                 $ret .= "$links{edit_friend}";
             } elsif ( $trusted_by && $watched_by ) {
                 $ret .= "$statustext{trustedby_watchedby}<br />";
+                $ret .= "$links{edit_friend}";
+            } elsif ( $trusted ) {
+                $ret .= "$statustext{trusted}<br />";
+                $ret .= "$links{edit_friend}";
+            } elsif ( $trusted_by ) {
+                $ret .= "$statustext{trusted_by}<br />";
+                $ret .= "$links{edit_friend}";
+            } elsif ( $watched ) {
+                $ret .= "$statustext{watched}<br />";
+                $ret .= "$links{edit_friend}";
+            } elsif ( $watched_by ) {
+                $ret .= "$statustext{watched_by}<br />";
                 $ret .= "$links{edit_friend}";
             } else {
                 if ( $view eq "read" ) {
--------------------------------------------------------------------------------