--- loncom/interface/loncommon.pm 2009/02/10 12:20:17 1.744 +++ loncom/interface/loncommon.pm 2009/03/01 20:24:39 1.760 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.744 2009/02/10 12:20:17 ehlerst Exp $ +# $Id: loncommon.pm,v 1.760 2009/03/01 20:24:39 harmsja 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"; - (Help: $topic) + (Help: $topic) ENDTEMPLATE - if ($text ne '') { $template.='
' }; + return $template; } @@ -2810,7 +2808,7 @@ sub aboutmewrapper { return; } return ''.$link.''; + ($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.''; } # ------------------------------------------------------------ Syllabus Wrapper @@ -4525,7 +4523,7 @@ form, .inline { display: inline; } /* just for tests */ .LC_300Box { width:300px; } -.LC_200Box {width:200px; } +.LC_400Box {width:400px; } .LC_500Box {width:500px; } .LC_600Box {width:600px; } .LC_800Box {width:800px;} @@ -5593,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; @@ -5618,7 +5623,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; @@ -5650,12 +5655,12 @@ ol#LC_TabMainMenuContent li a{ } ul.LC_TabContent { min-height:1.6em; - border-bottom:solid 1px $lg_border_color; } ul.LC_TabContent li{ vertical-align:middle; padding:0px 10px 0px 10px; - background-color:$lg_border_color; + background-color:$tabbg; + border-bottom:solid 1px $lg_border_color; } ul.LC_TabContent li a, ul.LC_TabContent li{ color:rgb(47,47,47); @@ -5665,6 +5670,7 @@ ul.LC_TabContent li a, ul.LC_TabContent } ul.LC_TabContent li:hover, ul.LC_TabContent li.active{ background-color:#FFFFFF; + border-bottom:solid 1px #FFFFFF; } ul.LC_TabContentBigger li{ vertical-align:bottom; @@ -5726,7 +5732,21 @@ ol#LC_PathBreadcrumbs li a{ { border: solid 1px $lg_border_color; } - +.LC_ContentBoxSpecialContactInfo +{ + border: solid 1px $lg_border_color; + max-width:25%; + min-width:25%; +} +.LC_AboutMe_Image +{ + float:left; + margin-right:10px; +} +.LC_Clear_AboutMe_Image +{ + clear:left; +} dl.LC_ListStyleClean dt { padding-right: 5px; display: table-header-group; @@ -5802,12 +5822,7 @@ div.LC_columnSection { div.LC_columnSection>* { float: left; margin: 10px 20px 10px 0px; - overflow:hidden; -} -div.LC_columnSection > .LC_ContentBox, -div.LC_columnSection > .LC_ContentBoxSpecial - { - width: 400px; + overflow:hidden; } .ContentBoxSpecialTemplate @@ -5822,7 +5837,6 @@ div.LC_columnSection > .ContentBoxTempla div.LC_columnSection > .ContentBoxSpecialTemplate { width: 600px; - } .clear{ @@ -5873,11 +5887,104 @@ div.LC_columnSection > .ContentBoxSpecia } .LC_loginpage_space { - clear:both; - margin-bottom:20px; + clear: both; + margin-bottom: 20px; border-bottom: 1px solid #CCCCCC; } +table em{ + font-weight: bold; + font-style: normal; +} + +table#LC_tableOfContent{ + border-collapse: collapse; + border-spacing: 0; + padding: 3px; + border: 0; + background-color: #FFFFFF; + font-size: 90%; +} +table#LC_tableOfContent a { + text-decoration: none; +} + +table#LC_tableOfContent tr.LC_trOdd{ + background-color: #EEEEEE; +} + +table#LC_tableOfContent img{ + border: none; + height: 1.3em; + 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 } @@ -6147,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; }