--- loncom/interface/lonfeedback.pm 2009/11/04 17:45:49 1.278 +++ loncom/interface/lonfeedback.pm 2009/12/07 15:46:16 1.281 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.278 2009/11/04 17:45:49 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.281 2009/12/07 15:46:16 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -569,7 +569,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
- $lt{'cuse'}: | + $lt{'cuse'}:END @@ -591,7 +591,7 @@ END | - $lt{'chgt'}? + $lt{'chgt'}? |
$lt{'myqu'}
@@ -2138,17 +2136,17 @@ $start_page$lt{'soor'} | -- | $lt{'sprs'} | -- | $lt{'spur'} | -- | $lt{'spse'} | -- | $lt{'spgr'} | -- | $lt{'psub'} | +$lt{'soor'} | ++ | $lt{'sprs'} | ++ | $lt{'spur'} | ++ | $lt{'spse'} | ++ | $lt{'spgr'} | ++ | $lt{'psub'} |
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -2645,12 +2643,12 @@ sub screen_header {
}
if ($msgoptions) {
$msgoptions='' - .' '.&mt('Send Feedback').'' + .' '.&mt('Send Feedback').''.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').' ' .$msgoptions; } if ($discussoptions) { $discussoptions='' - .' '.&mt('Discussion Contributions').'' + .' '.&mt('Discussion Contributions').''.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').' ' .$discussoptions; } return $msgoptions.$discussoptions; @@ -2951,7 +2949,19 @@ sub show_preview { ); } - +sub contains_block_html { + my ($message)=@_; + return ($message =~ m/ + <(br|h1|h2|h3|h4|h5|h6|p|ol|ul|table|pre|address|blockquote|center|div) + [\s]* + ([\w]+\=['"][\w]+['"])* + [\s]* + ( + [\s]*[\/]>| + >.*<\/\1[\s]*> + )/x ); +} + sub newline_to_br { my ($message)=@_; my $newmessage; @@ -3043,7 +3053,7 @@ $toolarge
|