--- loncom/interface/lonhtmlcommon.pm 2006/05/12 16:45:41 1.128 +++ loncom/interface/lonhtmlcommon.pm 2009/01/12 01:37:57 1.197 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.128 2006/05/12 16:45:41 albertel Exp $ +# $Id: lonhtmlcommon.pm,v 1.197 2009/01/12 01:37:57 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,6 +60,61 @@ use Time::Local; use Time::HiRes; use Apache::lonlocal; use Apache::lonnet; +use LONCAPA; + + +############################################## +############################################## + +=pod + +=item dragmath_button + +Creates a button that launches a dragmath popup-window, in which an +expression can be edited and pasted as LaTeX into a specified textarea. + + textarea - Name of the textarea to edit. + helpicon - If true, show a help icon to the right of the button. + +=cut + +sub dragmath_button { + my ($textarea,$helpicon) = @_; + my $help_text; + if ($helpicon) { + $help_text = &Apache::loncommon::help_open_topic('Authoring_Math_Editor'); + } + my $buttontext=&mt('Edit Math'); + return <<ENDDRAGMATH; + <input type="button" value="$buttontext", onclick="javascript:mathedit('$textarea',document)" />$help_text +ENDDRAGMATH +} + +############################################## + +=pod + +=item dragmath_js + +Javascript used to open pop-up window containing dragmath applet which +can be used to paste LaTeX into a textarea. + +=cut + +sub dragmath_js { + my ($popup) = @_; + return <<ENDDRAGMATHJS; + <script type="text/javascript"> + function mathedit(textarea, doc) { + targetEntry = textarea; + targetDoc = doc; + newwin = window.open("/adm/dragmath/applet/$popup.html","","width=565,height=500,resizable"); + } + </script> + +ENDDRAGMATHJS +} + ############################################## ############################################## @@ -76,7 +131,7 @@ use Apache::lonnet; sub authorbombs { my $url=shift; $url=&Apache::lonnet::declutter($url); - my ($udom,$uname)=($url=~/^(\w+)\/(\w+)\//); + my ($udom,$uname)=($url=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)/}); my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom); foreach (keys %bombs) { if ($_=~/^$udom\/$uname\//) { @@ -93,29 +148,35 @@ sub authorbombs { sub recent_filename { my $area=shift; - return 'nohist_recent_'.&Apache::lonnet::escape($area); + return 'nohist_recent_'.&escape($area); } sub store_recent { - my ($area,$name,$value)=@_; + my ($area,$name,$value,$freeze)=@_; my $file=&recent_filename($area); my %recent=&Apache::lonnet::dump($file); if (scalar(keys(%recent))>20) { # remove oldest value - my $oldest=time; + my $oldest=time(); my $delkey=''; - foreach (keys %recent) { - my $thistime=(split(/\&/,$recent{$_}))[0]; - if ($thistime<$oldest) { + foreach my $item (keys(%recent)) { + my $thistime=(split(/\&/,$recent{$item}))[0]; + if (($thistime ne "always_include") && ($thistime<$oldest)) { $oldest=$thistime; - $delkey=$_; + $delkey=$item; } } &Apache::lonnet::del($file,[$delkey]); } # store new value + my $timestamp; + if ($freeze) { + $timestamp = "always_include"; + } else { + $timestamp = time(); + } &Apache::lonnet::put($file,{ $name => - time.'&'.&Apache::lonnet::escape($value) }); + $timestamp.'&'.&escape($value) }); } sub remove_recent { @@ -130,11 +191,12 @@ sub select_recent { my $return="\n<select name='$fieldname'". ($event?" onchange='$event'":''). ">\n<option value=''>--- ".&mt('Recent')." ---</option>"; - foreach (sort keys %recent) { - unless ($_=~/^error\:/) { - my $escaped = &Apache::loncommon::escape_url($_); + foreach my $value (sort(keys(%recent))) { + unless ($value =~/^error\:/) { + my $escaped = &Apache::loncommon::escape_url($value); + &Apache::loncommon::inhibit_menu_check(\$escaped); $return.="\n<option value='$escaped'>". - &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]). + &unescape((split(/\&/,$recent{$value}))[1]). '</option>'; } } @@ -147,24 +209,45 @@ sub get_recent { my %recent=&Apache::lonnet::dump(&recent_filename($area)); # Create hash with key as time and recent as value +# Begin filling return_hash with any 'always_include' option my %time_hash = (); - foreach (keys %recent) { - my $thistime=(split(/\&/,$recent{$_}))[0]; - $time_hash{$thistime} = $_; + my %return_hash = (); + foreach my $item (keys %recent) { + my ($thistime,$thisvalue)=(split(/\&/,$recent{$item})); + if ($thistime eq 'always_include') { + $return_hash{$item} = &unescape($thisvalue); + $n--; + } else { + $time_hash{$thistime} = $item; + } } # Sort by decreasing time and return key value pairs - my %return_hash = (); my $idx = 1; - foreach (reverse sort keys %time_hash) { - $return_hash{$time_hash{$_}} = - &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]); + foreach my $item (reverse(sort(keys(%time_hash)))) { + $return_hash{$time_hash{$item}} = + &unescape((split(/\&/,$recent{$time_hash{$item}}))[1]); if ($n && ($idx++ >= $n)) {last;} } return %return_hash; } +sub get_recent_frozen { + my ($area) = @_; + my %recent=&Apache::lonnet::dump(&recent_filename($area)); + +# Create hash with all 'frozen' items + my %return_hash = (); + foreach my $item (keys(%recent)) { + my ($thistime,$thisvalue)=(split(/\&/,$recent{$item})); + if ($thistime eq 'always_include') { + $return_hash{$item} = &unescape($thisvalue); + } + } + return %return_hash; +} + =pod @@ -281,7 +364,8 @@ The method used to restrict user input w ############################################## sub date_setter { my ($formname,$dname,$currentvalue,$special,$includeempty,$state, - $no_hh_mm_ss,$defhour,$defmin,$defsec) = @_; + $no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink) = @_; + my $now = time; my $wasdefined=1; if (! defined($state) || $state ne 'disabled') { $state = ''; @@ -290,28 +374,25 @@ sub date_setter { $no_hh_mm_ss = 0; } if ($currentvalue eq 'now') { - $currentvalue=time; + $currentvalue = $now; } if ((!defined($currentvalue)) || ($currentvalue eq '')) { $wasdefined=0; if ($includeempty) { $currentvalue = 0; } else { - $currentvalue = time; + $currentvalue = $now; } } # other potentially useful values: wkday,yrday,is_daylight_savings + my $tzname; my ($sec,$min,$hour,$mday,$month,$year)=('','',undef,'','',''); if ($currentvalue) { - ($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = - localtime($currentvalue); - $year += 1900; + ($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)) { - ($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = - localtime(time); - $year += 1900; $sec=($defsec?$defsec:0); $min=($defmin?$defmin:0); $hour=($defhour?$defhour:0); @@ -323,7 +404,7 @@ sub date_setter { } my $result = "\n<!-- $dname date setting form -->\n"; $result .= <<ENDJS; -<script language="Javascript"> +<script type="text/javascript"> function $dname\_checkday() { var day = document.$formname.$dname\_day.value; var month = document.$formname.$dname\_month.value; @@ -386,7 +467,7 @@ document.$formname.$dname\_year.value, } </script> ENDJS - $result .= ' <nobr>'; + $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 @@ -429,22 +510,61 @@ ENDJS $hourselector .= " </select>\n"; my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />}; my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />}; - my $cal_link = qq{<a href="javascript:$dname\_opencalendar()">}; + my $cal_link; + if (!$nolink) { + $cal_link = qq{<a href="javascript:$dname\_opencalendar()">}; + } # + my $tzone = ' '.$tzname.' '; if ($no_hh_mm_ss) { - $result .= &mt('[_1] [_2] [_3] [_4]Select Date[_5]', - $monthselector,$dayselector,$yearselector, - $cal_link,'</a>'); + $result .= &mt('[_1] [_2] [_3] ', + $monthselector,$dayselector,$yearselector). + $tzone; + if (!$nolink) { + $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>'); + } } else { - $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s [_7]Select Date[_8]', - $monthselector,$dayselector,$yearselector, - $hourselector,$minuteselector,$secondselector, - $cal_link,'</a>'); + $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s ', + $monthselector,$dayselector,$yearselector, + $hourselector,$minuteselector,$secondselector). + $tzone; + if (!$nolink) { + $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>'); + } } - $result .= "</nobr>\n<!-- end $dname date setting form -->\n"; + $result .= "</span>\n<!-- end $dname date setting form -->\n"; return $result; } +sub get_timedates { + my ($epoch) = @_; + my $dt = DateTime->from_epoch(epoch => $epoch) + ->set_time_zone(&Apache::lonlocal::gettimezone()); + my $tzname = $dt->time_zone_short_name(); + my $sec = $dt->second; + my $min = $dt->minute; + my $hour = $dt->hour; + my $mday = $dt->day; + my $month = $dt->month; + if ($month) { + $month --; + } + my $year = $dt->year; + return ($tzname,$sec,$min,$hour,$mday,$month,$year); +} + +sub build_url { + my ($base, $fields)=@_; + my $url; + $url = $base.'?'; + foreach my $key (keys(%$fields)) { + $url.=&escape($key).'='.&escape($$fields{$key}).'&'; + } + $url =~ s/&$//; + return $url; +} + + ############################################## ############################################## @@ -513,20 +633,33 @@ sub get_date_from_form { if (defined($env{'form.'.$dname.'_month'})) { my $tmpmonth = $env{'form.'.$dname.'_month'}; if (($tmpmonth =~ /^\d+$/) && ($tmpmonth > 0) && ($tmpmonth < 13)) { - $month = $tmpmonth - 1; + $month = $tmpmonth; } } if (defined($env{'form.'.$dname.'_year'})) { my $tmpyear = $env{'form.'.$dname.'_year'}; - if (($tmpyear =~ /^\d+$/) && ($tmpyear > 1900)) { - $year = $tmpyear - 1900; + if (($tmpyear =~ /^\d+$/) && ($tmpyear >= 1970)) { + $year = $tmpyear; } } - if (($year<70) || ($year>137)) { return undef; } + if (($year<1970) || ($year>2037)) { return undef; } if (defined($sec) && defined($min) && defined($hour) && - defined($day) && defined($month) && defined($year) && - eval('&timelocal($sec,$min,$hour,$day,$month,$year)')) { - return &timelocal($sec,$min,$hour,$day,$month,$year); + defined($day) && defined($month) && defined($year)) { + my $timezone = &Apache::lonlocal::gettimezone(); + my $dt = DateTime->new( year => $year, + month => $month, + day => $day, + hour => $hour, + minute => $min, + second => $sec, + time_zone => $timezone, + ); + my $epoch_time = $dt->epoch; + if ($epoch_time ne '') { + return $epoch_time; + } else { + return undef; + } } else { return undef; } @@ -596,6 +729,8 @@ sub javascript_nothing { ############################################## ############################################## sub javascript_docopen { + my ($mimetype) = @_; + $mimetype ||= 'text/html'; # safari does not understand document.open() and loads "text/html" my $nothing = "''"; my $user_browser; @@ -609,7 +744,7 @@ sub javascript_docopen { if ($user_browser eq 'safari' && $user_os =~ 'mac') { $nothing = "document.clear()"; } else { - $nothing = "document.open('text/html','replace')"; + $nothing = "document.open('$mimetype','replace')"; } return $nothing; } @@ -646,23 +781,18 @@ Returns: a perl string as described. ############################################## ############################################## sub StatusOptions { - my ($status, $formName,$size,$onchange)=@_; + my ($status, $formName,$size,$onchange,$mult)=@_; $size = 1 if (!defined($size)); if (! defined($status)) { $status = 'Active'; $status = $env{'form.Status'} if (exists($env{'form.Status'})); } - my $OpSel1 = ''; - my $OpSel2 = ''; - my $OpSel3 = ''; - - if($status eq 'Any') { $OpSel3 = ' selected'; } - elsif($status eq 'Expired' ) { $OpSel2 = ' selected'; } - else { $OpSel1 = ' selected'; } - my $Str = ''; $Str .= '<select name="Status"'; + if (defined($mult)){ + $Str .= ' multiple="multiple" '; + } if(defined($formName) && $formName ne '' && ! defined($onchange)) { $Str .= ' onchange="document.'.$formName.'.submit()"'; } @@ -671,12 +801,18 @@ sub StatusOptions { } $Str .= ' size="'.$size.'" '; $Str .= '>'."\n"; - $Str .= '<option value="Active" '.$OpSel1.'>'. - &mt('Currently Enrolled').'</option>'."\n"; - $Str .= '<option value="Expired" '.$OpSel2.'>'. - &mt('Previously Enrolled').'</option>'."\n"; - $Str .= '<option value="Any" '.$OpSel3.'>'. - &mt('Any Enrollment Status').'</option>'."\n"; + foreach my $type (['Active', &mt('Currently Has Access')], + ['Future', &mt('Will Have Future Access')], + ['Expired', &mt('Previously Had Access')], + ['Any', &mt('Any Access Status')]) { + my ($name,$label) = @$type; + $Str .= '<option value="'.$name.'" '; + if ($status eq $name) { + $Str .= 'selected="selected" '; + } + $Str .= '>'.$label.'</option>'."\n"; + } + $Str .= '</select>'."\n"; } @@ -818,10 +954,10 @@ sub Create_PrgWin { function openpopwin () { popwin=open(\'\',\'popwin\',\'width=400,height=100\');". "popwin.document.writeln(\'".$start_page. - "<h4>$heading</h4>". - "<form name=popremain>". + "<h4>".&mt("$heading")."<\/h4>". + "<form action= \"\" name=\"popremain\" method=\"post\">". '<input type="text" size="'.$width.'" name="remaining" value="'. - &mt('Starting').'"></form>'.$end_page. + &mt('Starting').'" /><\\/form>'.$end_page. "\');". "popwin.document.close();}". "\nwindow.setTimeout(openpopwin,0)</script>"); @@ -831,14 +967,13 @@ sub Create_PrgWin { $prog_state{'window'}='window'; if (!$formname) { $prog_state{'formname'}=&get_uniq_name(); - &r_print($r,'<form name="'.$prog_state{'formname'}.'">'); + &r_print($r,'<form action="" name="'.$prog_state{'formname'}.'">'); } else { $prog_state{'formname'}=$formname; } if (!$inputname) { $prog_state{'inputname'}=&get_uniq_name(); - &r_print($r,$heading.' <input type="text" name="'.$prog_state{'inputname'}. - '" size="'.$width.'" />'); + &r_print($r,&mt("$heading [_1]",' <input type="text" name="'.$prog_state{'inputname'}.'" size="'.$width.'" />')); } else { $prog_state{'inputname'}=$inputname; @@ -858,7 +993,7 @@ sub Create_PrgWin { # update progress sub Update_PrgWin { my ($r,$prog_state,$displayString)=@_; - &r_print($r,'<script>'.$$prog_state{'window'}.'.document.'. + &r_print($r,'<script type="text/javascript">'.$$prog_state{'window'}.'.document.'. $$prog_state{'formname'}.'.'. $$prog_state{'inputname'}.'.value="'. $displayString.'";</script>'); @@ -946,7 +1081,7 @@ sub r_print { # ------------------------------------------------------- Puts directory header sub crumbs { - my ($uri,$target,$prefix,$form,$size,$noformat)=@_; + my ($uri,$target,$prefix,$form,$size,$noformat,$skiplast)=@_; if (! defined($size)) { $size = '+2'; } @@ -962,18 +1097,30 @@ sub crumbs { foreach my $dir (split('/',$uri)) { if (! $dir) { next; } $path .= $dir; - unless ($path eq $uri) { $path.='/'; } - my $linkpath = &Apache::loncommon::escape_single($path); - if ($form) { - $linkpath= - qq{javascript:$form.action='$linkpath';$form.submit();}; - } - $output.=qq{<a href="$linkpath" $target>$dir</a>/}; + if ($path eq $uri) { + if ($skiplast) { + $output.=$dir; + last; + } + } else { + $path.='/'; + } + my $href_path = &HTML::Entities::encode($path,'<>&"'); + &Apache::loncommon::inhibit_menu_check(\$href_path); + if ($form) { + my $href = 'javascript:'.$form.".action='".$href_path."';".$form.'.submit();'; + $output.=qq{<a href="$href" $target>$dir</a>/}; + } else { + $output.=qq{<a href="$href_path" $target>$dir</a>/}; + } } } else { - $output.=$uri; + foreach my $dir (split('/',$uri)) { + if (! $dir) { next; } + $output.=$dir.'/'; + } } - unless ($uri=~/\/$/) { $output=~s/\/$//; } + if ($uri !~ m|/$|) { $output=~s|/$||; } return $output.'</font>'.($noformat?'':'</b></tt><br />'); } @@ -982,9 +1129,14 @@ sub crumbs { sub spellheader { my $start_page= &Apache::loncommon::start_page('Speller Suggestions',undef, - {'only_body' => 1, - 'js_ready' => 1, - 'bgcolor' => '#DDDDDD',}); + {'only_body' => 1, + 'js_ready' => 1, + 'bgcolor' => '#DDDDDD', + 'add_entries' => { + 'onload' => + 'document.forms.spellcheckform.submit()', + } + }); my $end_page= &Apache::loncommon::end_page({'js_ready' => 1}); @@ -994,9 +1146,10 @@ sub spellheader { //<!-- BEGIN LON-CAPA Internal var checkwin; -function spellcheckerwindow() { +function spellcheckerwindow(string) { + var esc_string = string.replace(/\"/g,'"'); checkwin=window.open($nothing,'spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'); - checkwin.document.writeln('$start_page<form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form>$end_page'); + checkwin.document.writeln('$start_page<form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="'+esc_string+'" /><\\/form>$end_page'); checkwin.document.close(); } // END LON-CAPA Internal --> @@ -1010,7 +1163,7 @@ sub spelllink { my ($form,$field)=@_; my $linktext=&mt('Check Spelling'); return (<<ENDLINK); -<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { if (document.$form.onsubmit!=null) { document.$form.onsubmit();}};spellcheckerwindow();checkwin.document.forms.spellcheckform.text.value=this.document.forms.$form.$field.value;checkwin.document.forms.spellcheckform.submit();">$linktext</a> +<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { if (document.$form.onsubmit!=null) { document.$form.onsubmit();}};spellcheckerwindow(this.document.forms.$form.$field.value);">$linktext</a> ENDLINK } @@ -1033,45 +1186,13 @@ ENDLINK } sub htmlareaheaders { - if (&htmlareablocked()) { return ''; } - unless (&htmlareabrowser()) { return ''; } - my $lang='en'; - if (&mt('htmlarea_lang') ne 'htmlarea_lang') { - $lang=&mt('htmlarea_lang'); - } + return if (&htmlareablocked()); + return if (!&htmlareabrowser()); return (<<ENDHEADERS); -<script type="text/javascript"> -_editor_url='/htmlarea/'; -_editor_lang='$lang'; -</script> -<script type="text/javascript" src="/htmlarea/htmlarea.js"></script> +<script type="text/javascript" src="/fckeditor/fckeditor.js"></script> ENDHEADERS } -# ------------------------------------------------- Activate additional buttons - -sub htmlareaaddbuttons { - if (&htmlareablocked()) { return ''; } - unless (&htmlareabrowser()) { return ''; } - return (<<ENDADDBUTTON); - var config=new HTMLArea.Config(); - config.registerButton('ed_math','LaTeX Inline', - '/htmlarea/images/ed_math.gif',false, - function(editor,id) { - editor.surroundHTML(' <m>\$','\$</m> '); - } - ); - config.registerButton('ed_math_eqn','LaTeX Equation', - '/htmlarea/images/ed_math_eqn.gif',false, - function(editor,id) { - editor.surroundHTML( - ' \\n<center><m>\\\\[','\\\\]</m></center>\\n '); - } - ); - config.toolbar.push(['ed_math','ed_math_eqn']); -ENDADDBUTTON -} - # ----------------------------------------------------------------- Preferences sub disablelink { @@ -1079,7 +1200,7 @@ sub disablelink { if (defined($#fields)) { unless ($#fields>=0) { return ''; } } - return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>'; + return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>'; } sub enablelink { @@ -1087,7 +1208,16 @@ sub enablelink { if (defined($#fields)) { unless ($#fields>=0) { return ''; } } - return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>'; + return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>'; +} + +# ------------------------------------------------- lang to use in html editor +sub htmlarea_lang { + my $lang='en'; + if (&mt('htmlarea_lang') ne 'htmlarea_lang') { + $lang=&mt('htmlarea_lang'); + } + return $lang; } # ----------------------------------------- Script to activate only some fields @@ -1096,10 +1226,18 @@ sub htmlareaselectactive { my @fields=@_; unless (&htmlareabrowser()) { return ''; } if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); } - my $output='<script type="text/javascript" defer="1">'. - &htmlareaaddbuttons(); - foreach(@fields) { - $output.="\nHTMLArea.replace('$_',config);"; + my $output='<script type="text/javascript" defer="1">'; + my $lang = &htmlarea_lang(); + foreach my $field (@fields) { + $output.=" +{ + var oFCKeditor = new FCKeditor('$field'); + oFCKeditor.Config['CustomConfigurationsPath'] = + '/fckeditor/loncapaconfig.js'; + oFCKeditor.ReplaceTextarea(); + oFCKeditor.Config['AutoDetectLanguage'] = false; + oFCKeditor.Config['DefaultLanguage'] = '$lang'; +}"; } $output.="\nwindow.status='Activated Editfields';\n</script><br />". &disablelink(@fields); @@ -1135,13 +1273,13 @@ A link to help for the component will be All inputs can be undef without problems. -Inputs: $color (the background color of the table returned), - $component (the large text on the right side of the table), +Inputs: $component (the large text on the right side of the table), $component_help - $function (role to get colors from) - $domain (domian of role) $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 @@ -1154,7 +1292,8 @@ Pushes a breadcrumb on the stack of crum input: $breadcrumb, a hash reference. The keys 'href','title', and 'text' are required. If present the keys 'faq' and 'bug' will be used to provide -links to the FAQ and bug sites. +links to the FAQ and bug sites. If the key 'no_mt' is present the 'title' +and 'text' values won't be sent through &mt() returns: nothing @@ -1166,14 +1305,17 @@ returns: nothing my @Crumbs; sub breadcrumbs { - my ($component,$component_help,$menulink,$helplink) = @_; + my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt) = @_; # - my $Str = "\n".'<table id="LC_breadcrumbs"><tr><td>'; + $css_class ||= 'LC_breadcrumbs'; + my $Str = "\n".'<table class="'.$css_class.'"><tr><td><ol id="LC_MenuBreadcrumbs">'; # # Make the faq and bug data cascade my $faq = ''; my $bug = ''; my $help=''; + # Crumb Symbol + my $crumbsymbol = ' ▶ '; # The last breadcrumb does not have a link, so handle it separately. my $last = pop(@Crumbs); # @@ -1181,35 +1323,47 @@ returns: nothing if (!defined($menulink)) { $menulink=1; } if ($menulink) { my $description = 'Menu'; + my $no_mt_descr = 0; if (exists($env{'request.course.id'}) && $env{'request.course.id'} ne '') { $description = $env{'course.'.$env{'request.course.id'}.'.description'}; + $no_mt_descr = 1; } unshift(@Crumbs,{ href =>'/adm/menu', title =>'Go to main menu', target =>'_top', text =>$description, + no_mt =>$no_mt_descr, }); } my $links .= - join('->', + join($crumbsymbol, map { $faq = $_->{'faq'} if (exists($_->{'faq'})); $bug = $_->{'bug'} if (exists($_->{'bug'})); $help = $_->{'help'} if (exists($_->{'help'})); - my $result = '<a href="'.$_->{'href'}.'" '; + my $result = '<li><a href="'.$_->{'href'}.'" '; if (defined($_->{'target'}) && $_->{'target'} ne '') { $result .= 'target="'.$_->{'target'}.'" '; } - $result .='title="'.&mt($_->{'title'}).'">'. - &mt($_->{'text'}).'</a>'; + if ($_->{'no_mt'}) { + $result .='title="'.$_->{'title'}.'">'. + $_->{'text'}.'</a></li>'; + } else { + $result .='title="'.&mt($_->{'title'}).'">'. + &mt($_->{'text'}).'</a></li>'; + } $result; } @Crumbs ); - $links .= '->' if ($links ne ''); - $links .= '<b>'.&mt($last->{'text'}).'</b>'; + $links .= $crumbsymbol if ($links ne ''); + if ($last->{'no_mt'}) { + $links .= '<li><b>'.$last->{'text'}.'</b></li>'; + } else { + $links .= '<li><b>'.&mt($last->{'text'}).'</b></li>'; + } # my $icons = ''; $faq = $last->{'faq'} if (exists($last->{'faq'})); @@ -1222,20 +1376,25 @@ returns: nothing # if ($bug ne '') { # $icons .= &Apache::loncommon::help_open_bug($bug); # } - if ($helplink ne 'nohelp') { - $icons .= &Apache::loncommon::help_open_menu(undef,$component, + if ($faq ne '' || $component_help ne '' || $bug ne '') { + $icons .= &Apache::loncommon::help_open_menu($component, $component_help, - undef,$faq,$bug); + $faq,$bug); } - if ($icons ne '') { - $Str .= $icons.' '; - } # - $Str .= $links.'</td>'; + $Str .= $links.'</ol></td>'; # if (defined($component)) { - $Str .= '<td class="LC_breadcrumb_component">'. - &mt($component).'</td>'; + $Str .= '<td class="'.$css_class.'_component">'; + if ($no_mt) { + $Str .= $component; + } else { + $Str .= &mt($component); + } + if ($icons ne '') { + $Str .= ' '.$icons; + } + $Str .= '</td>'; } $Str .= '</tr></table>'."\n"; # @@ -1270,8 +1429,8 @@ returns: nothing # row1 # row2 # row3 ... etc. -# &submit_row(0 -# &end_pickbox() +# &submit_row() +# &end_pick_box() # # where row1, row 2 etc. are chosen from &role_select_row,&course_select_row, # &status_select_row and &email_default_row @@ -1312,86 +1471,113 @@ returns: nothing # routines, but can also be called directly to start and end rows which have # needs that are not accommodated by the *_select_row() routines. +{ # Start: row_count block for pick_box +my @row_count; + sub start_pick_box { - my ($table_width) = @_; + my ($css_class) = @_; + if (defined($css_class)) { + $css_class = 'class="'.$css_class.'"'; + } else { + $css_class= 'class="LC_pick_box"'; + } + unshift(@row_count,0); my $output = <<"END"; - <table width="$table_width" border="0" cellpadding="0" cellspacing="1" bgcolor="#000000"> - <tr> - <td> - <table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#ffffff"> - <tr> - <td> - <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff"> + <table $css_class> END return $output; } sub end_pick_box { + shift(@row_count); my $output = <<"END"; </table> - </td> - </tr> - </table> - </td> - </tr> - </table> +END + return $output; +} + +sub row_headline { + my $output = <<"END"; + <tr><td colspan="2"> END return $output; } sub row_title { - my ($col_width,$tablecolor,$title) = @_; + $row_count[0]++; + my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row'; + my ($title,$css_title_class,$css_value_class) = @_; + $css_title_class ||= 'LC_pick_box_title'; + $css_title_class = 'class="'.$css_title_class.'"'; + + $css_value_class ||= 'LC_pick_box_value'; + + if ($title ne '') { + $title .= ':'; + } my $output = <<"ENDONE"; - <tr> - <td width="$col_width" bgcolor="$tablecolor"> - <table width="$col_width" border="0" cellpadding="8" cellspacing="0"> - <tr> - <td align="right"><b>$title:</b> - </td> - </tr> - </table> + <tr class="LC_pick_box_row"> + <td $css_title_class> + $title </td> - <td width="100%" valign="top"> - <table width="100%" border="0" cellpadding="8" cellspacing="0"> - <tr> + <td class="$css_value_class $css_class"> ENDONE return $output; } sub row_closure { + my ($no_separator) =@_; my $output = <<"ENDTWO"; - </tr> - </table> </td> </tr> +ENDTWO + if (!$no_separator) { + $output .= <<"ENDTWO"; <tr> - <td width="100%" colspan="2" bgcolor="#000000"> - <img src="/adm/lonMisc/blackdot.gif" /><br /> + <td colspan="2" class="LC_pick_box_separator"> </td> </tr> ENDTWO + } return $output; } +} # End: row_count block for pick_box + + sub role_select_row { - my ($roles,$col_width,$tablecolor,$title) = @_; + my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_; my $output; if (defined($title)) { - $output = &row_title($col_width,$tablecolor,$title); + $output = &row_title($title,$css_class); } - $output .= qq| <td valign="top"> + $output .= qq| <select name="roles" multiple >\n|; foreach my $role (@$roles) { my $plrole; if ($role eq 'ow') { $plrole = &mt('Course Owner'); + } elsif ($role eq 'cr') { + if ($show_separate_custom) { + if ($cdom ne '' && $cnum ne '') { + my %course_customroles = &course_custom_roles($cdom,$cnum); + foreach my $crrole (sort(keys(%course_customroles))) { + my ($plcrrole) = ($crrole =~ m|^cr/[^/]+/[^/]+/(.+)$|); + $output .= ' <option value="'.$crrole.'">'.$plcrrole. + '</option>'; + } + } + } else { + $plrole = &mt('Custom Role'); + } } else { $plrole=&Apache::lonnet::plaintext($role); } - $output .= ' <option value="'.$role.'">'.$plrole.'</option>'; + if (($role ne 'cr') || (!$show_separate_custom)) { + $output .= ' <option value="'.$role.'">'.$plrole.'</option>'; + } } - $output .= qq| </select> - </td>\n|; + $output .= qq| </select>\n|; if (defined($title)) { $output .= &row_closure(); } @@ -1399,11 +1585,18 @@ sub role_select_row { } sub course_select_row { - my ($col_width,$tablecolor,$title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_; - my $output = &row_title($col_width,$tablecolor,$title); - $output .= " <td>\n"; - $output .= qq| -<script type="text/javascript" language="Javascript" > + my ($title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles, + $css_class) = @_; + my $output = &row_title($title,$css_class); + $output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles); + $output .= &row_closure(); + return $output; +} + +sub course_selection { + my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_; + my $output = qq| +<script type="text/javascript"> function coursePick (formname) { for (var i=0; i<formname.coursepick.length; i++) { if (formname.coursepick[i].value == 'category') { @@ -1430,11 +1623,11 @@ sub course_select_row { |; my $courseform='<b>'.&Apache::loncommon::selectcourse_link ($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) { - $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.&mt('All courses'); my $numtitles = @$codetitles; if ($numtitles > 0) { - $output .= '<br /><input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />'; + $output .= '<input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />'; $output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n". '<select name="'.$$codetitles[0]. '" onChange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n". @@ -1475,24 +1668,22 @@ sub course_select_row { $output .= '</tr></table><br />'; } } - $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 /></td>'."\n"; - $output .= &row_closure(); + $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; } sub status_select_row { - my ($types,$col_width,$tablecolor,$title) = @_; + my ($types,$title,$css_class) = @_; my $output; if (defined($title)) { - $output = &row_title($col_width,$tablecolor,$title); + $output = &row_title($title,$css_class,'LC_pick_box_select'); } - $output .= qq| <td valign="top"> + $output .= qq| <select name="types" multiple>\n|; foreach my $status_type (sort(keys(%{$types}))) { $output .= ' <option value="'.$status_type.'">'.$$types{$status_type}.'</option>'; } - $output .= qq| </select> - </td>\n|; + $output .= qq| </select>\n|; if (defined($title)) { $output .= &row_closure(); } @@ -1500,18 +1691,17 @@ sub status_select_row { } sub email_default_row { - my ($authtypes,$col_width,$tablecolor,$title,$descrip) = @_; - my $output = &row_title($col_width,$tablecolor,$title); - my @rowcols = ('#eeeeee','#dddddd'); - $output .= ' <td>'.$descrip; - $output .= &start_pick_box(''); - $output .= ' <tr bgcolor="'.$tablecolor.'"> - <td><b>'.&mt('Authentication Method').'</b></td><td align="right"><b>'.&mt('Username -> e-mail conversion').'</b></td> - </tr>'."\n"; + my ($authtypes,$title,$descrip,$css_class) = @_; + my $output = &row_title($title,$css_class); + $output .= $descrip. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + '<th>'.&mt('Authentication Method').'</th>'. + '<th align="right">'.&mt('Username -> e-mail conversion').'</th>'."\n". + &Apache::loncommon::end_data_table_header_row(); my $rownum = 0; foreach my $auth (sort(keys(%{$authtypes}))) { my ($userentry,$size); - my $rowiter = $rownum%2; if ($auth =~ /^krb/) { $userentry = ''; $size = 25; @@ -1519,29 +1709,68 @@ sub email_default_row { $userentry = 'username@'; $size = 15; } - $output .= '<tr bgcolor="'.$rowcols[$rowiter].'"><td> '.$$authtypes{$auth}.'</td><td align="right">'.$userentry.'<input type="text" name="'.$auth.'" size="'.$size.'" /></td></tr>'; - $rownum ++; + $output .= &Apache::loncommon::start_data_table_row(). + '<td> '.$$authtypes{$auth}.'</td>'. + '<td align="right">'.$userentry. + '<input type="text" name="'.$auth.'" size="'.$size.'" /></td>'. + &Apache::loncommon::end_data_table_row(); } - $output .= &end_pick_box(); - $output .= " <br /></td>\n"; + $output .= &Apache::loncommon::end_data_table(); $output .= &row_closure(); return $output; } sub submit_row { - my ($col_width,$tablecolor,$title,$cmd,$submit_text) = @_; - my $output = &row_title($col_width,$tablecolor,$title); + 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| - <td width="100%" valign="top" align="right"> <br /> <input type="hidden" name="command" value="$cmd" /> <input type="submit" value="$submit_text"/> <br /><br /> - </td>\n|; + \n|; return $output; } +sub course_custom_roles { + my ($cdom,$cnum) = @_; + my %returnhash=(); + my %coursepersonnel=&Apache::lonnet::dump('nohist_userroles',$cdom,$cnum); + foreach my $person (sort(keys(%coursepersonnel))) { + my ($role) = ($person =~ /^([^:]+):/); + my ($end,$start) = split(/:/,$coursepersonnel{$person}); + if ($end == -1 && $start == -1) { + next; + } + if ($role =~ m|^cr/[^/]+/[^/]+/[^/]|) { + $returnhash{$role} ++; + } + } + return %returnhash; +} + + +############################################## +############################################## + +# topic_bar +# +# Generates a div containing a numbered (static image) followed by a title +# with a background color defined in the corresponding CSS: LC_topic_bar +# +sub topic_bar { + my ($imgnum,$title) = @_; + return ' +<div class="LC_topic_bar"> + <img alt="'.&mt('Step [_1]',$imgnum). + '"src="/res/adm/pages/bl_step'.$imgnum.'.gif" /> + <span>'.$title.'</span> +</div> +'; +} + ############################################## ############################################## @@ -1680,66 +1909,66 @@ sub set_form_elements { my $valuestring = join('","',@{$values{$name}}); $output .= qq| var textvalues = new Array ("$valuestring"); - var total = courseForm.$name.length; + var total = courseForm.elements['$name'].length; if (total > $numvalues) { total = $numvalues; } for (var i=0; i<total; i++) { - courseForm.$name\[i].value = textvalues[i]; + courseForm.elements['$name']\[i].value = textvalues[i]; } |; } else { $output .= qq| - courseForm.$name.value = "$values{$name}[0]"; + courseForm.elements['$name'].value = "$values{$name}[0]"; |; } } else { $output .= qq| - var elementLength = courseForm.$name.length; + var elementLength = courseForm.elements['$name'].length; if (elementLength==undefined) { |; foreach my $value (@{$values{$name}}) { if ($$elements{$name} eq 'selectbox') { $output .= qq| - if (courseForm.$name.options[0].value == "$value") { - courseForm.$name.options[0].selected = true; + if (courseForm.elements['$name'].options[0].value == "$value") { + courseForm.elements['$name'].options[0].selected = true; }|; } elsif (($$elements{$name} eq 'radio') || ($$elements{$name} eq 'checkbox')) { $output .= qq| - if (courseForm.$name.value == "$value") { - courseForm.$name.checked = true; + if (courseForm.elements['$name'].value == "$value") { + courseForm.elements['$name'].checked = true; }|; } } $output .= qq| } else { - for (var i=0; i<courseForm.$name.length; i++) { + for (var i=0; i<courseForm.elements['$name'].length; i++) { |; if ($$elements{$name} eq 'selectbox') { $output .= qq| - courseForm.$name.options[i].selected = false;|; + courseForm.elements['$name'].options[i].selected = false;|; } elsif (($$elements{$name} eq 'radio') || ($$elements{$name} eq 'checkbox')) { $output .= qq| - courseForm.$name\[i].checked = false;|; + courseForm.elements['$name']\[i].checked = false;|; } $output .= qq| } - for (var j=0; j<courseForm.$name.length; j++) { + for (var j=0; j<courseForm.elements['$name'].length; j++) { |; foreach my $value (@{$values{$name}}) { if ($$elements{$name} eq 'selectbox') { $output .= qq| - if (courseForm.$name.options[j].value == "$value") { - courseForm.$name.options[j].selected = true; + if (courseForm.elements['$name'].options[j].value == "$value") { + courseForm.elements['$name'].options[j].selected = true; }|; } elsif (($$elements{$name} eq 'radio') || ($$elements{$name} eq 'checkbox')) { $output .= qq| - if (courseForm.$name\[j].value == "$value") { - courseForm.$name\[j].checked = true; + if (courseForm.elements['$name']\[j].value == "$value") { + courseForm.elements['$name']\[j].checked = true; }|; } } @@ -1754,6 +1983,113 @@ sub set_form_elements { return $output; } +############################################## +############################################## + +# javascript_valid_email +# +# Generates javascript to validate an e-mail address. +# Returns a javascript function which accetps a form field as argumnent, and +# returns false if field.value does not satisfy two regular expression matches +# for a valid e-mail address. Backwards compatible with old browsers without +# support for javascript RegExp (just checks for @ in field.value in this case). + +sub javascript_valid_email { + my $scripttag .= <<'END'; +function validmail(field) { + var str = field.value; + if (window.RegExp) { + var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)"; + var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"; //" + var reg1 = new RegExp(reg1str); + var reg2 = new RegExp(reg2str); + if (!reg1.test(str) && reg2.test(str)) { + return true; + } + return false; + } + else + { + if(str.indexOf("@") >= 0) { + return true; + } + return false; + } +} +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. +# TODO: +# check for empty values +# -------------------------- + +sub generate_menu { + my @menu = @_; + my $menu_html = qq|<div class="LC_columnSection">|; + + foreach my $category (@menu) { #FIXME: insert appropriate classnames for styles when they're finished. + $menu_html .='<div class="LC_ContentBoxSpecial"> + <h3 class="LC_hcell">'.mt($category->{'categorytitle'}).'</h3> + <ul class="LC_ListStyleNormal">'; + foreach my $item ( @{ $category->{items} } ) { + next unless $item->{'permission'}; + $menu_html .= qq|<li class="LC_menubuttons_inline_text"><a href="$item->{'url'}" title="|.mt($item->{'linktitle'}).'">'; + if($item->{'icon'}){ + $menu_html .= qq|<img class ="LC_noBorder LC_middle" src="/res/adm/pages/$item->{'icon'}" alt="|; + if($item->{'alttext'}){ + $menu_html .= $item->{'alttext'}.'"/></a>'; + } else { #use linktext as alt text for the icon + $menu_html .= qq|$item->{'linktext'}"/></a>|; + } + } + $menu_html .= qq|<a href="$item->{'url'}" title="|.mt($item->{'linktitle'}).'">'; + $menu_html .= mt($item->{'linktext'}).'</a>'; + if (exists($item->{'help'})) { + $menu_html .= Apache::loncommon::help_open_topic($item->{'help'}); + } + $menu_html .= '</li>'; + } + $menu_html .= '</ul></div>'; + } + $menu_html .= qq|</div>|; + return $menu_html; +} + + 1; __END__