--- loncom/interface/lonhtmlcommon.pm	2010/01/22 13:54:06	1.182.4.9
+++ loncom/interface/lonhtmlcommon.pm	2008/11/26 17:11:55	1.185
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.182.4.9 2010/01/22 13:54:06 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.185 2008/11/26 17:11:55 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,31 +62,6 @@ use Apache::lonlocal;
 use Apache::lonnet;
 use LONCAPA;
 
-##############################################
-##############################################
-
-=pod
-
-=item confirm_success
-
-Successful completion of an operation message
-
-=cut
-
-sub confirm_success {
-   my ($message,$failure)=@_;
-   if ($failure) {
-      return '<span class="LC_error">'."\n"
-            .'<img src="/adm/lonIcons/navmap.wrong.gif" alt="'.&mt('Error').'" /> '."\n"
-            .$message."\n"
-            .'</span>'."\n";
-   } else {
-      return '<span class="LC_success">'."\n"
-            .'<img src="/adm/lonIcons/navmap.correct.gif" alt="'.&mt('OK').'" /> '."\n"
-            .$message."\n"
-            .'</span>'."\n";
-   }
-}
 
 ##############################################
 ##############################################
@@ -130,13 +105,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
@@ -312,7 +285,7 @@ sub checkbox {
         $Str .= 'value="'.$value.'"';
     } 
     if ($checked) {
-        $Str .= ' checked="checked"';
+        $Str .= ' checked="1"';
     }
     $Str .= ' />';
     return $Str;
@@ -334,7 +307,7 @@ sub radio {
         $Str .= 'value="'.$value.'"';
     } 
     if ($checked eq $value) {
-        $Str .= ' checked="checked"';
+        $Str .= ' checked="1"';
     }
     $Str .= ' />';
     return $Str;
@@ -432,7 +405,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;
@@ -493,7 +465,6 @@ document.$formname.$dname\_year.value,
         }
 
     }
-// ]]>
 </script>
 ENDJS
     $result .= '  <span style="white-space: nowrap;">';
@@ -505,23 +476,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) {
@@ -609,7 +580,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
 
@@ -978,8 +949,7 @@ 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\');".
@@ -990,9 +960,7 @@ sub Create_PrgWin {
 	      &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') {
@@ -1025,14 +993,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();
 }
 
@@ -1085,15 +1049,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();
 }
 
@@ -1101,11 +1061,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'));
     }
@@ -1136,7 +1092,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; }
@@ -1186,8 +1142,7 @@ sub spellheader {
 
     my $nothing=&javascript_nothing();
     return (<<ENDCHECK);
-<script type="text/javascript">
-// <![CDATA[
+<script type="text/javascript"> 
 //<!-- BEGIN LON-CAPA Internal
 var checkwin;
 
@@ -1198,7 +1153,6 @@ function spellcheckerwindow(string) {
     checkwin.document.close();
 }
 // END LON-CAPA Internal -->
-// ]]>
 </script>
 ENDCHECK
 }
@@ -1272,8 +1226,7 @@ sub htmlareaselectactive {
     my @fields=@_;
     unless (&htmlareabrowser()) { return ''; }
     if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
-    my $output='<script type="text/javascript" defer="1">'.
-               '// <![CDATA[';
+    my $output='<script type="text/javascript" defer="1">';
     my $lang = &htmlarea_lang();
     foreach my $field (@fields) {
 	$output.="
@@ -1286,9 +1239,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;
 }
@@ -1352,7 +1303,7 @@ returns: nothing
     my @Crumbs;
     
     sub breadcrumbs {
-        my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt) = @_;
+        my ($component,$component_help,$menulink,$helplink,$css_class) = @_;
         #
 	$css_class ||= 'LC_breadcrumbs';
         my $Str = "\n".'<table class="'.$css_class.'"><tr><td>';
@@ -1362,7 +1313,7 @@ returns: nothing
         my $bug = '';
 	my $help='';
 	# Crumb Symbol
-	my $crumbsymbol = '&raquo;&nbsp;';
+	my $crumbsymbol = ' &#x25b6; ';
         # The last breadcrumb does not have a link, so handle it separately.
         my $last = pop(@Crumbs);
         #
@@ -1432,12 +1383,8 @@ returns: nothing
         $Str .= $links.'</td>';
         #
         if (defined($component)) {
-            $Str .= '<td class="'.$css_class.'_component">';
-            if ($no_mt) {
-                $Str .= $component;
-            } else {
-                $Str .= &mt($component);
-            }
+            $Str .= '<td class="'.$css_class.'_component">'.
+                &mt($component);
 	    if ($icons ne '') {
 		$Str .= '&nbsp;'.$icons;
 	    }
@@ -1518,9 +1465,6 @@ 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 ($css_class) = @_;
     if (defined($css_class)) {
@@ -1528,7 +1472,6 @@ sub start_pick_box {
     } else {
 	$css_class= 'class="LC_pick_box"';
     }
-    unshift(@row_count,0);
     my $output = <<"END";
  <table $css_class>
 END
@@ -1536,7 +1479,6 @@ END
 }
 
 sub end_pick_box {
-    shift(@row_count);
     my $output = <<"END";
        </table>
 END
@@ -1552,12 +1494,11 @@ END
 
 sub row_title {
     my ($title,$css_title_class,$css_value_class) = @_;
-    $row_count[0]++;
-    my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
     $css_title_class ||= 'LC_pick_box_title';
     $css_title_class = 'class="'.$css_title_class.'"';
 
     $css_value_class ||= 'LC_pick_box_value';
+    $css_value_class = 'class="'.$css_value_class.'"';
 
     if ($title ne '') {
         $title .= ':';
@@ -1567,7 +1508,7 @@ sub row_title {
             <td $css_title_class>
 	       $title
             </td>
-            <td class="$css_value_class $css_class">
+            <td $css_value_class>
 ENDONE
     return $output;
 }
@@ -1589,21 +1530,14 @@ ENDTWO
     return $output;
 }
 
-} # End: row_count block for pick_box
-
-
 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 >\n|;
     foreach my $role (@$roles) {
         my $plrole;
         if ($role eq 'ow') {
@@ -1622,7 +1556,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>';
@@ -1637,18 +1571,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') {
@@ -1671,22 +1604,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) {
@@ -1731,7 +1653,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.'&nbsp;&nbsp;<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.'&nbsp;&nbsp;<input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br />'."\n";
     return $output;
 }
 
@@ -1742,7 +1664,7 @@ sub status_select_row {
         $output = &row_title($title,$css_class,'LC_pick_box_select');
     }
     $output .= qq|
-                                    <select name="types" multiple="multiple">\n|;
+                                    <select name="types" multiple>\n|;
     foreach my $status_type (sort(keys(%{$types}))) {
         $output .= '  <option value="'.$status_type.'">'.$$types{$status_type}.'</option>';
     }
@@ -1786,6 +1708,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 />
@@ -1827,7 +1750,8 @@ sub topic_bar {
     return '
 <div class="LC_topic_bar">
     <img alt="'.&mt('Step [_1]',$imgnum).
-              '" src="/res/adm/pages/bl_step'.$imgnum.'.gif" />&nbsp;'.$title.'
+              '"src="/res/adm/pages/bl_step'.$imgnum.'.gif" />&nbsp;
+    <span>'.$title.'</span>
 </div>
 ';
 }
@@ -1964,7 +1888,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}});
@@ -1999,8 +1923,6 @@ sub set_form_elements {
                     $output .= qq|
       if (courseForm.elements['$name'].value == "$value") {
           courseForm.elements['$name'].checked = true;
-      } else {
-          courseForm.elements['$name'].checked = false;
       }|;
                 }
             }
@@ -2042,7 +1964,6 @@ sub set_form_elements {
         }
     }
     $output .= "
-    return;
 }\n";
     return $output;
 }
@@ -2084,6 +2005,67 @@ 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',
+#			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:
+# add icon field
+# add alt tag for icon
+# check for empty values
+# --------------------------
+
+sub generate_menu {
+    my @menu = @_;
+    my $menu_html = '';
+
+    foreach my $category (@menu) { #FIXME: insert appropriate classnames for styles when they're finished.
+	$menu_html .='<div class="DivContentBox"><h3 class="">'.$category->{'categorytitle'}.'</h3><ul class="ListStyleNormal">';
+	foreach my $item (@{ $category->{items} }) {
+	    next if (! $item->{'permission'});
+	    $menu_html .= '<li class="">'.
+			    qq{<a href="$item->{'url'}" title="$item->{'linktitle'}">};
+            if($item->{'icon'}){
+                $menu_html .= qq{<img class = "" src="/res/adm/pages/$item->{'icon'}" alt=""/>} 
+            }
+            $menu_html .= &mt($item->{'linktext'}).'</a>';
+#	    if (exists($item->{'help'})) {
+#		$menu_html .= &Apache::loncommon::help_open_topic($item->{'help'});
+#	    }
+	    $menu_html .= '</li>';
+	}
+	$menu_html .= '</div>';
+    }
+    return $menu_html;
+}
 
 
 1;