If the community allows everyone (even nonmembers) to post, then show
the post link in the navstrip.
Also syncs the translation strings in the code with the ones that are
live on the site (which are shorter), to prevent the navstrip from stretching
the page too much.
Patch by denise.
diffs (107 lines):
diff -r ca607f1f3084 -r 26b05d3b044d bin/upgrading/en.dat
--- a/bin/upgrading/en.dat Mon Jun 21 21:59:26 2010 +0800
+++ b/bin/upgrading/en.dat Tue Jun 22 12:29:32 2010 +0800
@@ -3862,7 +3862,7 @@ web.controlstrip.btn.inbox=Inbox
web.controlstrip.links.addfeed=Add it to your reading page
-web.controlstrip.links.addtocircle=Add them to your circle
+web.controlstrip.links.addtocircle=Add to your circle
web.controlstrip.links.changecommsettings=Change Settings
@@ -3882,11 +3882,11 @@ web.controlstrip.links.inbox=Inbox
web.controlstrip.links.invitefriends=Invite Friends
-web.controlstrip.links.joincomm=Join this community
+web.controlstrip.links.joincomm=Join
web.controlstrip.links.learnmore=Learn more
-web.controlstrip.links.leavecomm=Leave this community
+web.controlstrip.links.leavecomm=Leave
web.controlstrip.links.login=Log in
@@ -3902,13 +3902,13 @@ web.controlstrip.links.more=More
web.controlstrip.links.mylj=My [[siteabbrev]]
-web.controlstrip.links.popfeeds=View the Most Popular Feeds
-
-web.controlstrip.links.post=Post to Journal
+web.controlstrip.links.popfeeds=View Popular Feeds
+
+web.controlstrip.links.post=Post
web.controlstrip.links.post2=Post
-web.controlstrip.links.postcomm=Post to this community
+web.controlstrip.links.postcomm=Post
web.controlstrip.links.queue=Queue
@@ -3916,9 +3916,9 @@ web.controlstrip.links.random=Random Jou
web.controlstrip.links.recentcomments=View Recent Comments
-web.controlstrip.links.removecomm=Unsubscribe from this community
-
-web.controlstrip.links.removefeed=Remove it from your reading page
+web.controlstrip.links.removecomm=Unsubscribe
+
+web.controlstrip.links.removefeed=Remove from your reading page
web.controlstrip.links.settings=Settings
@@ -3926,13 +3926,13 @@ web.controlstrip.links.stylemystyle=View
web.controlstrip.links.styleorigstyle=View in original style
-web.controlstrip.links.trackcomm=Track this community
-
-web.controlstrip.links.trackuser=Track this user
+web.controlstrip.links.trackcomm=Track
+
+web.controlstrip.links.trackuser=Track
web.controlstrip.links.viewreadingpage=Reading Page
-web.controlstrip.links.watchcomm=Subscribe to this community
+web.controlstrip.links.watchcomm=Subscribe
web.controlstrip.login.forgot=(Forgot it?)
diff -r ca607f1f3084 -r 26b05d3b044d cgi-bin/LJ/User.pm
--- a/cgi-bin/LJ/User.pm Mon Jun 21 21:59:26 2010 +0800
+++ b/cgi-bin/LJ/User.pm Tue Jun 22 12:29:32 2010 +0800
@@ -3748,6 +3748,7 @@ sub is_moderated_membership { $_[0]->mem
sub is_moderated_membership { $_[0]->membership_level eq 'moderated' ? 1 : 0; }
sub is_open_membership { $_[0]->membership_level eq 'open' ? 1 : 0; }
sub has_moderated_posting { $_[0]->prop( 'moderated' ); }
+sub has_open_posting { $_[0]->prop( 'nonmember_posting' ) ? 1 : 0; }
# returns an array of maintainer userids
diff -r ca607f1f3084 -r 26b05d3b044d cgi-bin/weblib.pl
--- a/cgi-bin/weblib.pl Mon Jun 21 21:59:26 2010 +0800
+++ b/cgi-bin/weblib.pl Tue Jun 22 12:29:32 2010 +0800
@@ -2818,7 +2818,7 @@ sub control_strip
my $isclosedcommunity = $journal->is_closed_membership;
if ( $remote->can_manage_other( $journal ) ) {
$ret .= "$statustext{maintainer}<br />";
- if ($haspostingaccess) {
+ if ( $haspostingaccess || $journal->has_open_posting ) {
$ret .= "$links{post_to_community} " unless
$remote->is_identity;
}
@@ -2854,7 +2854,7 @@ sub control_strip
$ret .= " " . $links{track_community};
} else {
$ret .= "$statustext{community}<br />";
- if ($haspostingaccess) {
+ if ( $haspostingaccess || $journal->has_open_posting ) {
$ret .= "$links{post_to_community} ";
}
$ret .= $isclosedcommunity ? "This is a closed
community " :
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
