Add warnings, to avoid unexpected or ambiguous behavior.
Patch by denise.
diffs (54 lines):
diff -r 3b42d2dbadf8 -r f70a34b46584 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat Mon Nov 02 10:36:52 2009 +0000
+++ b/bin/upgrading/en.dat Mon Nov 02 10:58:26 2009 +0000
@@ -4847,6 +4847,8 @@ xpost.error.connection=Failed to connect
xpost.error.invalidprotocol=Missing or invalid posting protocol.
+xpost.notrespected=This will not respect your default <a [[aopts]]>crosspost
settings</a>. Your crossposted entries will not be updated.
+
xpost.password=Password:
xpost.poll.view=View poll: [[name]]
@@ -4859,6 +4861,8 @@ xpost.request.success=Crosspost requeste
xpost.request.failed=Failed to crosspost to [[account]]. You may go <a href =
"[[editurl]]">here</a> to attempt to crosspost this entry again.
+xpost.respected=This will respect your default <a [[aopts]]>crosspost
settings</a>, so make sure you have them set properly before you do this.
+
xpost.success=Crosspost to [[usernam...@[[server]] successful. You can view
this entry <a href = "[[xpostlink]]">here</a>.
diff -r 3b42d2dbadf8 -r f70a34b46584 htdocs/editprivacy.bml
--- a/htdocs/editprivacy.bml Mon Nov 02 10:36:52 2009 +0000
+++ b/htdocs/editprivacy.bml Mon Nov 02 10:58:26 2009 +0000
@@ -78,6 +78,7 @@ body<=
$ret .= "<?p " . BML::ml('.calendar',
{ aopts => "href='" . $u->journal_base() .
"/calendar/'" })
. " p?>\n";;
+ $ret .= "<?p " . BML::ml( 'xpost.respected', { aopts =>
"href='$LJ::SITEROOT/manage/settings/?cat=othersites'" } ) . "p?>";
$ret .= "<form method='post' action='./editprivacy'>";
$ret .= "<?h1 $ML{'.timeframe'} h1?>";
diff -r 3b42d2dbadf8 -r f70a34b46584 htdocs/edittags.bml
--- a/htdocs/edittags.bml Mon Nov 02 10:36:52 2009 +0000
+++ b/htdocs/edittags.bml Mon Nov 02 10:58:26 2009 +0000
@@ -84,7 +84,9 @@ body<=
$logtags = $logtags->{$jitemid} || {};
my $logtagstr = join ', ', map { LJ::ejs($_) } sort values %$logtags;
- $ret .= "<?p $ML{'.intro'} p?><br />";
+ $ret .= "<?p $ML{'.intro'} p?>";
+ $ret .= "<?p " . BML::ml( 'xpost.notrespected', { aopts =>
"href='$LJ::SITEROOT/manage/settings/?cat=othersites'" } ) . " " . BML::ml(
'.xpost.notrespected.editentry', { aopts =>
"href='$LJ::SITEROOT/editjournal?journal=$journal&itemid=$ditemid'" } ) .
"p?><br />";
+
$ret .= "<script type='text/javascript'> var cur_taglist = '$logtagstr';
</script>";
$ret .= '<table class="edittbl" cellpadding="0" cellspacing="0"
width="50%">';
diff -r 3b42d2dbadf8 -r f70a34b46584 htdocs/edittags.bml.text
--- a/htdocs/edittags.bml.text Mon Nov 02 10:36:52 2009 +0000
+++ b/htdocs/edittags.bml.text Mon Nov 02 10:58:26 2009 +0000
@@ -37,3 +37,4 @@
.view=<a [[aopts]]>View</a> this entry.
+.xpost.notrespected.editentry=If this is important to you, <a [[aopts]]>edit
this entry directly</a> to add the tags.
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
