--- loncom/interface/lonhtmlcommon.pm	2009/05/20 21:32:53	1.182.4.1
+++ loncom/interface/lonhtmlcommon.pm	2008/12/17 12:59:49	1.196
@@ -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.196 2008/12/17 12:59:49 harmsja 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;
@@ -492,7 +467,7 @@ 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 
@@ -1328,17 +1303,17 @@ 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>';
+        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 = '&raquo;&nbsp;';
+	my $crumbsymbol = ' &#x25b6; ';
         # The last breadcrumb does not have a link, so handle it separately.
         my $last = pop(@Crumbs);
         #
@@ -1367,25 +1342,25 @@ returns: nothing
                      $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'}.'" ';
                      }
 		     if ($_->{'no_mt'}) {
 			 $result .='title="'.$_->{'title'}.'">'.
-			     $_->{'text'}.'</a>';
+			     $_->{'text'}.'</a></li>';
 		     } else {
 			 $result .='title="'.&mt($_->{'title'}).'">'.
-			     &mt($_->{'text'}).'</a>';
+			     &mt($_->{'text'}).'</a></li>';
 		     }
                      $result;
                      } @Crumbs
                  );
         $links .= $crumbsymbol if ($links ne '');
 	if ($last->{'no_mt'}) {
-	    $links .= '<b>'.$last->{'text'}.'</b>';
+	    $links .= '<li><b>'.$last->{'text'}.'</b></li>';
 	} else {
-	    $links .= '<b>'.&mt($last->{'text'}).'</b>';
+	    $links .= '<li><b>'.&mt($last->{'text'}).'</b></li>';
 	}
         #
         my $icons = '';
@@ -1405,15 +1380,11 @@ returns: nothing
 							 $faq,$bug);
 	}
         #
-        $Str .= $links.'</td>';
+        $Str .= $links.'</ol></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;
 	    }
@@ -1527,9 +1498,9 @@ 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';
+    my ($title,$css_title_class,$css_value_class) = @_;
     $css_title_class ||= 'LC_pick_box_title';
     $css_title_class = 'class="'.$css_title_class.'"';
 
@@ -1575,7 +1546,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 +1673,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 +1717,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 +2014,74 @@ 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;