--- loncom/interface/loncommon.pm 2009/07/27 11:30:05 1.867 +++ loncom/interface/loncommon.pm 2009/07/31 02:13:05 1.872 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.867 2009/07/27 11:30:05 kalberla Exp $ +# $Id: loncommon.pm,v 1.872 2009/07/31 02:13:05 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -529,6 +529,11 @@ sub coursebrowser_javascript { } } } + if (formname == 'ccrs') { + var ownername = document.forms[formid].ccuname.value; + var ownerdom = document.forms[formid].ccdomain.options[document.forms[formid].ccdomain.selectedIndex].value; + url += '&cloner='+ownername+':'+ownerdom; + } if (multflag !=null && multflag != '') { url += '&multiple='+multflag; } @@ -620,12 +625,16 @@ function setSect(sectionlist) { sub selectcourse_link { my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_; + my $linktext = &mt('Select Course'); + if ($selecttype eq 'Community') { + $linktext = &mt('Select Community'); + } return '' ."".&mt('Select Course').'' + ."'>".$linktext.'' .''; } @@ -1798,16 +1807,15 @@ selected"); If the $showdomdesc flag is set, the domain name is followed by the domain description. -If the $autosubmit flag is set, the form containing the domain selector will be auto-submitted by an onchange action. +The optional $onchange argumnet specifies what should occur if the domain selector is changed, e.g., 'this.form.submit()' if the form is to be automatically submitted. =cut #------------------------------------------- sub select_dom_form { - my ($defdom,$name,$includeempty,$showdomdesc,$autosubmit) = @_; - my $onchange; - if ($autosubmit) { - $onchange = ' onchange="this.form.submit()"'; + my ($defdom,$name,$includeempty,$showdomdesc,$onchange) = @_; + if ($onchange) { + ' onchange="'.$onchange.'"; } my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains()); if ($includeempty) { @domains=('',@domains); } @@ -3831,46 +3839,6 @@ sub parse_block_record { return ($setuname,$setudom,$title,$blocks); } -sub build_block_table { - my ($startblock,$endblock,$setters) = @_; - my %lt = &Apache::lonlocal::texthash( - 'cacb' => 'Currently active communication blocks', - 'cour' => 'Course', - 'dura' => 'Duration', - 'blse' => 'Block set by' - ); - my $output; - $output = '
'.$lt{'cacb'}.':
'; - $output .= &start_data_table(); - $output .= ' - - '.$lt{'cour'}.' - '.$lt{'dura'}.' - '.$lt{'blse'}.' - -'; - foreach my $course (keys(%{$setters})) { - my %courseinfo=&Apache::lonnet::coursedescription($course); - for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) { - my ($uname,$udom) = @{$$setters{$course}{staff}[$i]}; - my $fullname = &plainname($uname,$udom); - if (defined($env{'user.name'}) && defined($env{'user.domain'}) - && $env{'user.name'} ne 'public' - && $env{'user.domain'} ne 'public') { - $fullname = &aboutmewrapper($fullname,$uname,$udom); - } - my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]}; - $openblock = &Apache::lonlocal::locallocaltime($openblock); - $closeblock= &Apache::lonlocal::locallocaltime($closeblock); - $output .= &Apache::loncommon::start_data_table_row(). - ''.$courseinfo{'description'}.''. - ''.$openblock.' to '.$closeblock.''. - ''.$fullname.''. - &Apache::loncommon::end_data_table_row(); - } - } - $output .= &end_data_table(); -} sub blocking_status { my $blocked; my ($activity,$uname,$udom) = @_; @@ -3903,9 +3871,11 @@ END_MYBLOCK my $popupUrl = "/adm/blockingstatus/$querystring"; $output .= <<"END_BLOCK";
- - Communication Blocking - Communication Blocking + + Communication Blocked + Communication Blocked
END_BLOCK @@ -5888,24 +5858,13 @@ ul.LC_TabContent { background: $sidebg; border-bottom: solid 1px $lg_border_color; list-style:none; - margin: -10px -10px 0 -10px; + margin: 0 -10px; padding: 0; } -ul.LC_TabContentBigger { - display:block; - list-style:none; - padding: 0; -} - - ul.LC_TabContent li, ul.LC_TabContentBigger li { - display: inline; - border-right: solid 1px $lg_border_color; float:left; - line-height:140%; - white-space:nowrap; } ul#LC_TabMainMenuContent li a { @@ -5942,32 +5901,57 @@ ul.LC_TabContent li:hover, ul.LC_TabCont padding-right: 16px; } +#maincoursedoc { + clear:both; +} + +ul.LC_TabContentBigger { + display:block; + list-style:none; + padding: 0; +} + ul.LC_TabContentBigger li { - vertical-align:bottom; - border-top:solid 1px $lg_border_color; - border-left:solid 1px $lg_border_color; - padding:5px 10px 5px 10px; - margin-left:2px; - background: #d9d9d9; + vertical-align:bottom; + height: 30px; + font-size:110%; + font-weight:bold; + color: #737373; } -#maincoursedoc { - clear:both; + +ul.LC_TabContentBigger li a { + background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat; + height: 30px; + line-height: 30px; + text-align: center; + display: block; + text-decoration: none; } -ul.LC_TabContentBigger li:hover, -ul.LC_TabContentBigger li.active { - background: #ffffff; +ul.LC_TabContentBigger li:hover a, +ul.LC_TabContentBigger li.active a { + background:url('/adm/lonIcons/tabbgleft.gif') left top no-repeat; color:$font; + text-decoration: underline; } -ul.LC_TabContentBigger li, -ul.LC_TabContentBigger li a { - font-size:110%; - font-weight:bold; - color: #737373; + +ul.LC_TabContentBigger li b { + background: url('/adm/lonIcons/tabbgright.gif') no-repeat right bottom; + display: block; + float: left; + padding: 0 30px; +} + +ul.LC_TabContentBigger li:hover b, +ul.LC_TabContentBigger li.active b { + background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat; + color:$font; + border-bottom: 1px solid #FFFFFF; } + ul.LC_CourseBreadcrumbs { background: $sidebg; line-height: 32px;