--- loncom/interface/lonhtmlcommon.pm 2008/09/05 22:12:47 1.180
+++ loncom/interface/lonhtmlcommon.pm 2008/12/10 10:29:43 1.194
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.180 2008/09/05 22:12:47 riegler Exp $
+# $Id: lonhtmlcommon.pm,v 1.194 2008/12/10 10:29:43 amueller Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -102,18 +102,20 @@ can be used to paste LaTeX into a textar
=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/EditMathPopup.html","","width=565,height=500,resizable");
+ newwin = window.open("/adm/dragmath/applet/$popup.html","","width=565,height=500,resizable");
}
</script>
ENDDRAGMATHJS
}
+
##############################################
##############################################
@@ -465,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
@@ -1304,7 +1306,7 @@ returns: nothing
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="MenuBreadcrumbs">';
#
# Make the faq and bug data cascade
my $faq = '';
@@ -1340,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 = '';
@@ -1378,7 +1380,7 @@ returns: nothing
$faq,$bug);
}
#
- $Str .= $links.'</td>';
+ $Str .= $links.'</ol></td>';
#
if (defined($component)) {
$Str .= '<td class="'.$css_class.'_component">'.
@@ -1463,6 +1465,9 @@ 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)) {
@@ -1470,6 +1475,7 @@ sub start_pick_box {
} else {
$css_class= 'class="LC_pick_box"';
}
+ unshift(@row_count,0);
my $output = <<"END";
<table $css_class>
END
@@ -1477,19 +1483,28 @@ END
}
sub end_pick_box {
+ shift(@row_count);
my $output = <<"END";
</table>
END
return $output;
}
+sub row_headline {
+ my $output = <<"END";
+ <tr><td colspan="2">
+END
+ return $output;
+}
+
sub row_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';
- $css_value_class = 'class="'.$css_value_class.'"';
if ($title ne '') {
$title .= ':';
@@ -1499,7 +1514,7 @@ sub row_title {
<td $css_title_class>
$title
</td>
- <td $css_value_class>
+ <td class="$css_value_class $css_class">
ENDONE
return $output;
}
@@ -1521,6 +1536,9 @@ 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;
@@ -1699,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 />
@@ -1995,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="columnSection">|;
+
+ foreach my $category (@menu) { #FIXME: insert appropriate classnames for styles when they're finished.
+ $menu_html .='<div class="ContentBoxSpecial">
+ <h3 class="hcell">'.mt($category->{'categorytitle'}).'</h3>
+ <ul class="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 ="noBorder 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 .= '</div>';
+ }
+ $menu_html .= qq|</div>|;
+ return $menu_html;
+}
1;