--- loncom/interface/loncommon.pm 2009/02/25 10:04:20 1.754
+++ loncom/interface/loncommon.pm 2009/03/01 13:23:12 1.759
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.754 2009/02/25 10:04:20 droeschl Exp $
+# $Id: loncommon.pm,v 1.759 2009/03/01 13:23:12 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -923,19 +923,17 @@ sub help_open_topic {
}
# Add the text
- if ($text ne "") {
- $template .=
- "
".
- "$text";
+ if ($text ne "") {
+ $template.="$text";
}
# Add the graphic
my $title = &mt('Online Help');
my $helpicon=&lonhttpdurl("/adm/help/help.png");
$template .= <<"ENDTEMPLATE";
-
+
ENDTEMPLATE
- if ($text ne '') { $template.=' |
' };
+
return $template;
}
@@ -2810,8 +2808,7 @@ sub aboutmewrapper {
return;
}
return ''.$link.'';
+ ($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.'';
}
# ------------------------------------------------------------ Syllabus Wrapper
@@ -5594,7 +5591,14 @@ p, .LC_ContentBox {
cursor:pointer;
text-decoration:underline;
}
-
+.LC_helptextbgcolor
+{
+ background-color:#5555FF;
+}
+.LC_helptextfontcolor
+{
+ color:#FFFFFF;
+}
dl,ul,div,fieldset {
margin: 10px 10px 10px 0px;
@@ -5915,6 +5919,72 @@ table#LC_tableOfContent img{
vertical-align: text-bottom;
margin-right: 0.3em;
}
+
+a#LC_content_toolbar_firsthomework{
+ background-image:url(/res/adm/pages/open-first-problem.gif);
+}
+
+a#LC_content_toolbar_launchnav{
+ background-image:url(/res/adm/pages/start-navigation.gif);
+}
+
+a#LC_content_toolbar_closenav{
+ background-image:url(/res/adm/pages/close-navigation.gif);
+}
+
+a#LC_content_toolbar_everything{
+ background-image:url(/res/adm/pages/show-all.gif);
+}
+
+a#LC_content_toolbar_uncompleted{
+ background-image:url(/res/adm/pages/show-incomplete-problems.gif);
+}
+
+#LC_content_toolbar_clearbubbles{
+ background-image:url(/res/adm/pages/mark-discussionentries-read.gif);
+}
+
+a#LC_content_toolbar_changefolder{
+ background : url(/res/adm/pages/close-all-folders.gif) top center ;
+}
+
+a#LC_content_toolbar_changefolder_toggled{
+ background-image:url(/res/adm/pages/open-all-folders.gif);
+}
+
+ul#LC_toolbar li a:hover{
+ background-position: bottom center;
+}
+
+ul#LC_toolbar{
+ padding:0;
+ margin: 2px;
+ list-style:none;
+ position:relative;
+ background-color:white;
+}
+
+ul#LC_toolbar li{
+ border:1px solid white;
+ padding:0;
+ margin: 0;
+ display:inline-block;
+ vertical-align:middle;
+}
+
+a.LC_toolbarItem{
+ display:inline-block;
+ padding:0;
+ margin:0;
+ height: 32px;
+ width: 32px;
+ color:white;
+ border:0 none;
+ background-repeat:no-repeat;
+ background-color:transparent;
+}
+
+
END
}
@@ -6184,16 +6254,23 @@ sub start_page {
$result = &html_encode($result);
}
- if (exists($args->{'bread_crumbs'})) {
- &Apache::lonhtmlcommon::clear_breadcrumbs();
- if (ref($args->{'bread_crumbs'}) eq 'ARRAY') {
- foreach my $crumb (@{$args->{'bread_crumbs'}}){
- &Apache::lonhtmlcommon::add_breadcrumb($crumb);
- }
- }
- $result .= &Apache::lonhtmlcommon::breadcrumbs();
- }
+ #Breadcrumbs
+ if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ #if any br links exists, add them to the breadcrumbs
+ if (exists($args->{'bread_crumbs'}) and ref($args->{'bread_crumbs'}) eq 'ARRAY') {
+ foreach my $crumb (@{$args->{'bread_crumbs'}}){
+ &Apache::lonhtmlcommon::add_breadcrumb($crumb);
+ }
+ }
+ #if bread_crumbs_component exists show it as headline else show only the breadcrumbs
+ if(exists($args->{'bread_crumbs_component'})){
+ $result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
+ }else{
+ $result .= &Apache::lonhtmlcommon::breadcrumbs();
+ }
+ }
return $result;
}