--- loncom/interface/lonhtmlcommon.pm	2009/05/20 21:32:53	1.182.4.1
+++ loncom/interface/lonhtmlcommon.pm	2008/11/26 23:20:56	1.186
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.182.4.1 2009/05/20 21:32:53 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.186 2008/11/26 23:20:56 droeschl 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" /> '."\n"
-            .$message."\n"
-            .'</span>'."\n";
-   } else {
-      return '<span class="LC_success">'."\n"
-            .'<img src="/adm/lonIcons/navmap.correct.gif" /> '."\n"
-            .$message."\n"
-            .'</span>'."\n";
-   }
-}
 
 ##############################################
 ##############################################
@@ -310,7 +285,7 @@ sub checkbox {
         $Str .= 'value="'.$value.'"';
     } 
     if ($checked) {
-        $Str .= ' checked="checked"';
+        $Str .= ' checked="1"';
     }
     $Str .= ' />';
     return $Str;
@@ -332,7 +307,7 @@ sub radio {
         $Str .= 'value="'.$value.'"';
     } 
     if ($checked eq $value) {
-        $Str .= ' checked="checked"';
+        $Str .= ' checked="1"';
     }
     $Str .= ' />';
     return $Str;
@@ -1328,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>';
@@ -1338,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);
         #
@@ -1408,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;
 	    }
@@ -1494,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)) {
@@ -1504,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
@@ -1512,7 +1479,6 @@ END
 }
 
 sub end_pick_box {
-    shift(@row_count);
     my $output = <<"END";
        </table>
 END
@@ -1528,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 .= ':';
@@ -1543,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;
 }
@@ -1565,9 +1530,6 @@ 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 $output;
@@ -1575,7 +1537,7 @@ sub role_select_row {
         $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') {
@@ -1702,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>';
     }
@@ -1746,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 />
@@ -2042,6 +2005,71 @@ 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 = '';
+
+    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="};
+		if($item->{'alttext'}){
+		    $menu_html .= qq{$item->{'alttext'}"/>};
+		} else { #use linktext as alt text for the icon
+		    $menu_html .= qq{$item->{'linktext'}"/>};
+                } 
+            }
+            $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;