--- loncom/interface/loncommon.pm 2009/02/25 13:25:52 1.755 +++ loncom/interface/loncommon.pm 2009/03/04 12:43:31 1.762 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.755 2009/02/25 13:25:52 neumanie Exp $ +# $Id: loncommon.pm,v 1.762 2009/03/04 12:43:31 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -924,14 +924,14 @@ sub help_open_topic { # Add the text if ($text ne "") { - $template.="$text"; + $template.="$text"; } # Add the graphic my $title = &mt('Online Help'); my $helpicon=&lonhttpdurl("/adm/help/help.png"); $template .= <<"ENDTEMPLATE"; - (Help: $topic) + (Help: $topic) ENDTEMPLATE return $template; @@ -2808,8 +2808,7 @@ sub aboutmewrapper { return; } return ''.$link.''; + ($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.''; } # ------------------------------------------------------------ Syllabus Wrapper @@ -4245,7 +4244,7 @@ $realm  ENDROLE - my $titleinfo = ''.$title.''; + my $titleinfo = '

'.$title.'

'; if ($customtitle) { $titleinfo = $customtitle; } @@ -4612,9 +4611,6 @@ table#LC_title_bar td.LC_title_bar_who { span.LC_metadata { font-family: $sans; } -span.LC_title_bar_title { - font: bold x-large $sans; -} table#LC_title_bar td.LC_title_bar_domain_logo { background: $sidebg; text-align: right; @@ -5582,6 +5578,12 @@ h2,h3,h4,h5,h6 overflow:hidden; } +.LC_Right { + float: right; + margin: 0px; + padding: 0px; +} + p, .LC_ContentBox { padding: 10px; @@ -5592,7 +5594,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; @@ -5617,7 +5626,7 @@ ol.LC_smallMenu a { color: RGB(80, 80, 80); text-decoration: none; } -ol#LC_TabMainMenueContent, ul.LC_TabContent , +ol#LC_TabMainMenuContent, ul.LC_TabContent , ul.LC_TabContentBigger { display:block; list-style:none; @@ -5661,10 +5670,12 @@ ul.LC_TabContent li a, ul.LC_TabContent text-decoration:none; font-size:95%; font-weight:bold; + padding-right: 16px; } ul.LC_TabContent li:hover, ul.LC_TabContent li.active{ - background-color:#FFFFFF; + background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center; border-bottom:solid 1px #FFFFFF; + padding-right: 16px; } ul.LC_TabContentBigger li{ vertical-align:bottom; @@ -5913,6 +5924,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 } @@ -6182,16 +6259,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; }