--- loncom/interface/lonhtmlcommon.pm 2010/02/15 17:02:47 1.182.4.12
+++ loncom/interface/lonhtmlcommon.pm 2009/05/11 16:18:53 1.213
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.182.4.12 2010/02/15 17:02:47 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.213 2009/05/11 16:18:53 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -62,21 +62,6 @@ use Apache::lonlocal;
use Apache::lonnet;
use LONCAPA;
-sub coursepreflink {
- my ($text,$category)=@_;
- if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
- return '<a href="/adm/courseprefs?phase=display&actions='.$category.'">'.$text.'</a>';
- } else {
- return '';
- }
-}
-
-sub raw_href_to_link {
- my ($message)=@_;
- $message=~s/(https?\:\/\/[^\s\'\"\<]+)([\s\<]|$)/<a href="$1"><tt>$1<\/tt><\/a>$2/gi;
- return $message;
-}
-
##############################################
##############################################
@@ -91,13 +76,13 @@ Successful completion of an operation me
sub confirm_success {
my ($message,$failure)=@_;
if ($failure) {
- return '<span class="LC_error" style="font-size: inherit;">'."\n"
- .'<img src="/adm/lonIcons/navmap.wrong.gif" alt="'.&mt('Error').'" /> '."\n"
+ return '<span class="LC_error">'."\n"
+ .'<img src="/adm/lonIcons/navmap.wrong.gif" /> '."\n"
.$message."\n"
.'</span>'."\n";
} else {
return '<span class="LC_success">'."\n"
- .'<img src="/adm/lonIcons/navmap.correct.gif" alt="'.&mt('OK').'" /> '."\n"
+ .'<img src="/adm/lonIcons/navmap.correct.gif" /> '."\n"
.$message."\n"
.'</span>'."\n";
}
@@ -145,13 +130,11 @@ sub dragmath_js {
my ($popup) = @_;
return <<ENDDRAGMATHJS;
<script type="text/javascript">
- // <![CDATA[
function mathedit(textarea, doc) {
targetEntry = textarea;
targetDoc = doc;
newwin = window.open("/adm/dragmath/applet/$popup.html","","width=565,height=500,resizable");
}
- // ]]>
</script>
ENDDRAGMATHJS
@@ -237,9 +220,6 @@ sub select_recent {
unless ($value =~/^error\:/) {
my $escaped = &Apache::loncommon::escape_url($value);
&Apache::loncommon::inhibit_menu_check(\$escaped);
- if ($area eq 'residx') {
- next if ((!&Apache::lonnet::allowed('bre',$value)) && (!&Apache::lonnet::allowed('bro',$value)));
- }
$return.="\n<option value='$escaped'>".
&unescape((split(/\&/,$recent{$value}))[1]).
'</option>';
@@ -436,8 +416,8 @@ sub date_setter {
($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($currentvalue);
}
unless ($wasdefined) {
+ ($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($now);
if (($defhour) || ($defmin) || ($defsec)) {
- ($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($now);
$sec=($defsec?$defsec:0);
$min=($defmin?$defmin:0);
$hour=($defhour?$defhour:0);
@@ -450,7 +430,6 @@ sub date_setter {
my $result = "\n<!-- $dname date setting form -->\n";
$result .= <<ENDJS;
<script type="text/javascript">
-// <![CDATA[
function $dname\_checkday() {
var day = document.$formname.$dname\_day.value;
var month = document.$formname.$dname\_month.value;
@@ -511,10 +490,9 @@ document.$formname.$dname\_year.value,
}
}
-// ]]>
</script>
ENDJS
- $result .= ' <span style="white-space: nowrap;">';
+ $result .= ' <span class="LC_nobreak">';
my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};
# Month
my @Months = qw/January February March April May June
@@ -523,23 +501,23 @@ ENDJS
unshift(@Months,'If you can read this an error occurred');
if ($includeempty) { $monthselector.="<option value=''></option>"; }
for(my $m = 1;$m <=$#Months;$m++) {
- $monthselector .= qq{ <option value="$m"};
- $monthselector .= ' selected="selected"' if ($m-1 eq $month);
- $monthselector .= '> '.&mt($Months[$m]).' </option>'."\n";
+ $monthselector .= qq{ <option value="$m" };
+ $monthselector .= "selected " if ($m-1 eq $month);
+ $monthselector .= '> '.&mt($Months[$m]).' </option>';
}
$monthselector.= ' </select>';
# Day
my $dayselector = qq{<input type="text" name="$dname\_day" $state value="$mday" size="3" $special onchange="javascript:$dname\_checkday()" />};
# Year
- my $yearselector = qq{<input type="text" name="$dname\_year" $state value="$year" size="5" $special onchange="javascript:$dname\_checkday()" />};
+ my $yearselector = qq{<input type="year" name="$dname\_year" $state value="$year" size="5" $special onchange="javascript:$dname\_checkday()" />};
#
my $hourselector = qq{<select name="$dname\_hour" $special $state >};
if ($includeempty) {
$hourselector.=qq{<option value=''></option>};
}
for (my $h = 0;$h<24;$h++) {
- $hourselector .= qq{<option value="$h"};
- $hourselector .= ' selected="selected"' if (defined($hour) && $hour == $h);
+ $hourselector .= qq{<option value="$h" };
+ $hourselector .= "selected " if (defined($hour) && $hour == $h);
$hourselector .= ">";
my $timest='';
if ($h == 0) {
@@ -627,7 +605,7 @@ Inputs:
=item $dname
-The name passed to &date_setter, which prefixes the form elements.
+The name passed to &datesetter, which prefixes the form elements.
=item $defaulttime
@@ -996,21 +974,18 @@ sub Create_PrgWin {
#the whole function called through timeout is due to issues
#in mozilla Read BUG #2665 if you want to know the whole story
- &r_print($r,'<script type="text/javascript">'."\n".
- '// <![CDATA['."\n".
+ &r_print($r,'<script type="text/javascript">'.
"var popwin;
function openpopwin () {
popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
"popwin.document.writeln(\'".$start_page.
"<h4>".&mt("$heading")."<\/h4>".
- "<form action= \"\" name=\"popremain\" method=\"post\">".
+ "<form action=\"\" name=\"popremain\" method=\"post\">".
'<input type="text" size="'.$width.'" name="remaining" value="'.
&mt('Starting').'" /><\\/form>'.$end_page.
"\');".
"popwin.document.close();}".
- "\nwindow.setTimeout(openpopwin,0)\n".
- '// ]]>'."\n".
- '</script>');
+ "\nwindow.setTimeout(openpopwin,0)</script>");
$prog_state{'formname'}='popremain';
$prog_state{'inputname'}="remaining";
} elsif ($type eq 'inline') {
@@ -1043,14 +1018,10 @@ sub Create_PrgWin {
# update progress
sub Update_PrgWin {
my ($r,$prog_state,$displayString)=@_;
- &r_print($r,'<script type="text/javascript">'."\n".
- '// <![CDATA['."\n".
- $$prog_state{'window'}.'.document.'.
+ &r_print($r,'<script type="text/javascript">'.$$prog_state{'window'}.'.document.'.
$$prog_state{'formname'}.'.'.
$$prog_state{'inputname'}.'.value="'.
- $displayString.'";'."\n".
- '// ]]>'."\n".
- '</script>');
+ $displayString.'";</script>');
$$prog_state{'laststart'}=&Time::HiRes::time();
}
@@ -1103,15 +1074,11 @@ sub Increment_PrgWin {
if ($user_browser eq 'explorer' && $user_os =~ 'mac') {
$lasttime = '';
}
- &r_print($r,'<script>'."\n".
- '// <![CDATA['."\n".
- $$prog_state{'window'}.'.document.'.
+ &r_print($r,'<script>'.$$prog_state{'window'}.'.document.'.
$$prog_state{'formname'}.'.'.
$$prog_state{'inputname'}.'.value="'.
$$prog_state{'done'}.'/'.$$prog_state{'max'}.
- ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'."\n".
- '// ]]>'."\n".
- '</script>');
+ ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.'</script>');
$$prog_state{'laststart'}=&Time::HiRes::time();
}
@@ -1119,11 +1086,7 @@ sub Increment_PrgWin {
sub Close_PrgWin {
my ($r,$prog_state)=@_;
if ($$prog_state{'type'} eq 'popup') {
- &r_print($r,'<script>'."\n".
- '// <![CDATA['."\n".
- 'popwin.close()'."n".
- '// ]]>'."\n".
- '</script>'."\n");
+ &r_print($r,'<script>popwin.close()</script>'."\n");
} elsif ($$prog_state{'type'} eq 'inline') {
&Update_PrgWin($r,$prog_state,&mt('Done'));
}
@@ -1154,7 +1117,7 @@ sub crumbs {
my $output='';
unless ($noformat) { $output.='<br /><tt><b>'; }
$output.='<font size="'.$size.'">'.$prefix.'/';
- if (($env{'user.adv'}) || ($env{'user.author'})) {
+ if ($env{'user.adv'}) {
my $path=$prefix.'/';
foreach my $dir (split('/',$uri)) {
if (! $dir) { next; }
@@ -1204,8 +1167,7 @@ sub spellheader {
my $nothing=&javascript_nothing();
return (<<ENDCHECK);
-<script type="text/javascript">
-// <![CDATA[
+<script type="text/javascript">
//<!-- BEGIN LON-CAPA Internal
var checkwin;
@@ -1216,7 +1178,6 @@ function spellcheckerwindow(string) {
checkwin.document.close();
}
// END LON-CAPA Internal -->
-// ]]>
</script>
ENDCHECK
}
@@ -1290,8 +1251,7 @@ sub htmlareaselectactive {
my @fields=@_;
unless (&htmlareabrowser()) { return ''; }
if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
- my $output='<script type="text/javascript" defer="defer">'.
- '// <![CDATA[';
+ my $output='<script type="text/javascript" defer="1">';
my $lang = &htmlarea_lang();
foreach my $field (@fields) {
$output.="
@@ -1304,9 +1264,7 @@ sub htmlareaselectactive {
oFCKeditor.Config['DefaultLanguage'] = '$lang';
}";
}
- $output.="\nwindow.status='Activated Editfields';\n".
- '// ]]>'."\n".
- '</script><br />'.
+ $output.="\nwindow.status='Activated Editfields';\n</script><br />".
&disablelink(@fields);
return $output;
}
@@ -1345,6 +1303,8 @@ Inputs: $component (the large text on th
$menulink (boolean, controls whether to include a link to /adm/menu)
$helplink (if 'nohelp' don't include the orange help link)
$css_class (optional name for the class to apply to the table for CSS)
+ $no_mt (optional flag, 1 if &mt() is _not_ to be applied to $component
+ when including the text on the right.
Returns a string containing breadcrumbs for the current page.
=item clear_breadcrumbs
@@ -1370,10 +1330,16 @@ returns: nothing
my @Crumbs;
sub breadcrumbs {
- my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt) = @_;
+ my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt, $no_realBreadcrumb) = @_;
#
$css_class ||= 'LC_breadcrumbs';
- my $Str = "\n".'<table class="'.$css_class.'"><tr><td>';
+ my $Str1 = '<ol id="LC_MenuBreadcrumbs">';
+
+ if($no_realBreadcrumb){
+ $Str1 = '<ul class="LC_CourseBreadcrumbs">';
+ }
+
+ my $Str = '';
#
# Make the faq and bug data cascade
my $faq = '';
@@ -1403,8 +1369,8 @@ returns: nothing
no_mt =>$no_mt_descr,
});
}
- my $links .=
- join($crumbsymbol,
+ my $links .= '<li>'.
+ join('</li><li>'.$crumbsymbol,
map {
$faq = $_->{'faq'} if (exists($_->{'faq'}));
$bug = $_->{'bug'} if (exists($_->{'bug'}));
@@ -1413,6 +1379,7 @@ returns: nothing
if (defined($_->{'target'}) && $_->{'target'} ne '') {
$result .= 'target="'.$_->{'target'}.'" ';
}
+ # set the possible translation for title
if ($_->{'no_mt'}) {
$result .='title="'.$_->{'title'}.'">'.
$_->{'text'}.'</a>';
@@ -1422,14 +1389,20 @@ returns: nothing
}
$result;
} @Crumbs
- );
- $links .= $crumbsymbol if ($links ne '');
+ ).'</li>';
+#Workaround for edit course.
+ if(@Crumbs == 0 ){
+ $links .= '<li>' if ($links ne '');
+ } else {
+ $links .= '<li>'.$crumbsymbol if ($links ne '');
+ }
+#should the last Element be translated?
if ($last->{'no_mt'}) {
$links .= '<b>'.$last->{'text'}.'</b>';
} else {
$links .= '<b>'.&mt($last->{'text'}).'</b>';
}
- #
+ $links .= '</li>';
my $icons = '';
$faq = $last->{'faq'} if (exists($last->{'faq'}));
$bug = $last->{'bug'} if (exists($last->{'bug'}));
@@ -1447,10 +1420,17 @@ returns: nothing
$faq,$bug);
}
#
- $Str .= $links.'</td>';
+
+
+ if($no_realBreadcrumb){
+ $Str1 .= $links.'</ul>';
+ } else {
+ $Str1 .= $links.'</ol>';
+ }
#
if (defined($component)) {
- $Str .= '<td class="'.$css_class.'_component">';
+ $Str .= "\n".'<table class="'.$css_class.'">'
+ .'<tr><td class="'.$css_class.'_component">';
if ($no_mt) {
$Str .= $component;
} else {
@@ -1459,15 +1439,14 @@ returns: nothing
if ($icons ne '') {
$Str .= ' '.$icons;
}
- $Str .= '</td>';
+ $Str .= '</td></tr></table>'."\n";
}
- $Str .= '</tr></table>'."\n";
#
# Return the @Crumbs stack to what we started with
push(@Crumbs,$last);
shift(@Crumbs);
- #
- return $Str;
+ # Return a table and after that the breadcrumb's line
+ return "$Str\n$Str1";
}
sub clear_breadcrumbs {
@@ -1612,16 +1591,12 @@ ENDTWO
sub role_select_row {
my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_;
- my $crstype = 'Course';
- if ($cdom ne '' && $cnum ne '') {
- $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);
- }
my $output;
if (defined($title)) {
$output = &row_title($title,$css_class);
}
$output .= qq|
- <select name="roles" multiple="multiple" >\n|;
+ <select name="roles" multiple="multiple">\n|;
foreach my $role (@$roles) {
my $plrole;
if ($role eq 'ow') {
@@ -1640,7 +1615,7 @@ sub role_select_row {
$plrole = &mt('Custom Role');
}
} else {
- $plrole=&Apache::lonnet::plaintext($role,$crstype);
+ $plrole=&Apache::lonnet::plaintext($role);
}
if (($role ne 'cr') || (!$show_separate_custom)) {
$output .= ' <option value="'.$role.'">'.$plrole.'</option>';
@@ -1655,18 +1630,17 @@ sub role_select_row {
sub course_select_row {
my ($title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles,
- $css_class,$crstype) = @_;
+ $css_class) = @_;
my $output = &row_title($title,$css_class);
- $output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype);
+ $output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles);
$output .= &row_closure();
return $output;
}
sub course_selection {
- my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype) = @_;
+ my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_;
my $output = qq|
<script type="text/javascript">
-// <![CDATA[
function coursePick (formname) {
for (var i=0; i<formname.coursepick.length; i++) {
if (formname.coursepick[i].value == 'category') {
@@ -1689,22 +1663,11 @@ sub course_selection {
formname.courselist = '';
}
}
-// ]]>
</script>
|;
-
- my ($allcrs,$pickspec);
- if ($crstype eq 'Community') {
- $allcrs = &mt('All communities');
- $pickspec = &mt('Pick specific communities:');
- } else {
- $allcrs = &mt('All courses');
- $pickspec = &mt('Pick specific course(s):');
- }
-
my $courseform='<b>'.&Apache::loncommon::selectcourse_link
- ($formname,'pickcourse','pickdomain','coursedesc','',1,$crstype).'</b>';
- $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.$allcrs.'<br />';
+ ($formname,'pickcourse','pickdomain','coursedesc','',1).'</b>';
+ $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.&mt('All courses').'<br />';
if ($totcodes > 0) {
my $numtitles = @$codetitles;
if ($numtitles > 0) {
@@ -1749,7 +1712,7 @@ sub course_selection {
$output .= '</tr></table><br />';
}
}
- $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."','dccourse','dcdomain','coursedesc','','1'".')" />'.$pickspec.' '.$courseform.' <input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br />'."\n";
+ $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."','dccourse','dcdomain','coursedesc','','1'".')" />'.&mt('Pick specific course(s):').' '.$courseform.' <input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br />'."\n";
return $output;
}
@@ -1804,6 +1767,7 @@ sub email_default_row {
sub submit_row {
my ($title,$cmd,$submit_text,$css_class) = @_;
+ $submit_text = &mt($submit_text);
my $output = &row_title($title,$css_class,'LC_pick_box_submit');
$output .= qq|
<br />
@@ -1845,7 +1809,8 @@ sub topic_bar {
return '
<div class="LC_topic_bar">
<img alt="'.&mt('Step [_1]',$imgnum).
- '" src="/res/adm/pages/bl_step'.$imgnum.'.gif" /> '.$title.'
+ ' "src="/res/adm/pages/bl_step'.$imgnum.'.gif" />
+ <span>'.$title.'</span>
</div>
';
}
@@ -1982,7 +1947,7 @@ sub set_form_elements {
$values{$name}[$i] =~ s/([\r\n\f]+)/\\n/g;
$values{$name}[$i] =~ s/"/\\"/g;
}
- if (($$elements{$name} eq 'text') || ($$elements{$name} eq 'hidden')) {
+ if ($$elements{$name} eq 'text') {
my $numvalues = @{$values{$name}};
if ($numvalues > 1) {
my $valuestring = join('","',@{$values{$name}});
@@ -2017,8 +1982,6 @@ sub set_form_elements {
$output .= qq|
if (courseForm.elements['$name'].value == "$value") {
courseForm.elements['$name'].checked = true;
- } else {
- courseForm.elements['$name'].checked = false;
}|;
}
}
@@ -2060,7 +2023,6 @@ sub set_form_elements {
}
}
$output .= "
- return;
}\n";
return $output;
}
@@ -2102,7 +2064,108 @@ END
return $scripttag;
}
+##############################################
+##############################################
+
+# generate_menu
+#
+# Generates html markup for a menu.
+#
+# Inputs:
+# An array of following structure:
+# ({ categorytitle => 'Categorytitle',
+# items => [
+# {
+# linktext => 'Text to be displayed',
+# url => 'URL the link is pointing to, i.e. /adm/site?action=dosomething',
+# permission => 'Contains permissions as returned from lonnet::allowed(),
+# must evaluate to true in order to activate the link',
+# icon => 'icon filename',
+# alttext => 'alt text for the icon',
+# help => 'Name of the corresponding helpfile',
+# linktitle => 'Description of the link (used for title tag)'
+# },
+# ...
+# ]
+# },
+# ...
+# )
+#
+# Outputs: A scalar containing the html markup for the menu.
+
+# ---- Remove when done ----
+# This routine is part of the redesign of LON-CAPA and it's
+# subject to change during this project.
+# Don't rely on its current functionality as it might be
+# changed or removed.
+# --------------------------
+sub generate_menu {
+ my @menu = @_;
+
+ # usage: $wrap->(element, content, {attribute => value,...});
+ # output: content enclosed in html conform tags
+ my $wrap = sub {
+ return
+ qq|<$_[0]|
+ . join( '', map { qq| $_="${$_[2]}{$_}"| } keys %{ $_[2] } )
+ . ($_[1] ? qq|>$_[1]</$_[0]>| : qq|/>|). "\n";
+ };
+
+ # subs for specific html elements
+ my $h3 = sub { return $wrap->( "h3", @_ ) };
+ my $div = sub { return $wrap->( "div", @_ ) };
+ my $ul = sub { return $wrap->( "ul", @_ ) };
+ my $li = sub { return $wrap->( "li", @_ ) };
+ my $a = sub { return $wrap->( "a", @_ ) };
+ my $img = sub { return $wrap->( "img", @_ ) };
+
+ my @categories; # each element represents the entire markup for a category
+
+ foreach my $category (@menu) {
+ my @links; # contains the links for the current $category
+ foreach my $link (@{$$category{items}}) {
+ next unless $$link{permission};
+
+ # create the markup for the current $link and push it into @links.
+ # each entry consists of an image and a text optionally followed
+ # by a help link.
+ push @links, $li->(
+ $a->(
+ $img->("", {
+ class => "LC_noBorder LC_middle",
+ src => "/res/adm/pages/$$link{icon}",
+ alt => mt(defined($$link{alttext}) ?
+ $$link{alttext} : $$link{linktext})
+ }), {
+ href => $$link{url},
+ title => mt($$link{linktitle})
+ }).
+ $a->(mt($$link{linktext}), {
+ href => $$link{url},
+ title => mt($$link{linktitle}),
+ class => "LC_menubuttons_link"
+ }).
+ (defined($$link{help}) ?
+ Apache::loncommon::help_open_topic($$link{help}) : ''),
+ {class => "LC_menubuttons_inline_text"});
+ }
+
+ # wrap categorytitle in <h3>, concatenate with
+ # joined and in <ul> tags wrapped @links
+ # and wrap everything in an enclosing <div> and push it into
+ # @categories
+ # such that each element looks like:
+ # <div><h3>title</h3><ul><li>...</li>...</ul></div>
+ # the category won't be added if there aren't any links
+ push @categories,
+ $div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}).
+ $ul->(join('' ,@links), {class =>"LC_ListStyleNormal" }),
+ {class=>"LC_ContentBoxSpecial LC_400Box"}) if scalar(@links);
+ }
+ # wrap the joined @categories in another <div> (column layout)
+ return $div->(join('', @categories), {class => "LC_columnSection"});
+}
1;