--- loncom/interface/loncommon.pm 2009/03/19 10:49:55 1.774 +++ loncom/interface/loncommon.pm 2009/05/08 13:38:41 1.807 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.774 2009/03/19 10:49:55 ehlerst Exp $ +# $Id: loncommon.pm,v 1.807 2009/05/08 13:38:41 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -406,9 +406,9 @@ sub studentbrowser_javascript { || ($env{'request.role'}=~/^(au|dc|su)/) ) { return ''; } return (<<'ENDSTDBRW'); -<script type="text/javascript" language="Javascript" > +<script type="text/javascript" language="Javascript"> var stdeditbrowser; - function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) { + function openstdbrowser(formname,uname,udom,roleflag,ignorefilter,courseadvonly) { var url = '/adm/pickstudent?'; var filter; if (!ignorefilter) { @@ -422,6 +422,7 @@ sub studentbrowser_javascript { url += 'form=' + formname + '&unameelement='+uname+ '&udomelement='+udom; if (roleflag) { url+="&roles=1"; } + if (courseadvonly) { url+="&courseadvonly=1"; } var title = 'Student_Browser'; var options = 'scrollbars=1,resizable=1,menubar=0'; options += ',width=700,height=600'; @@ -433,26 +434,33 @@ ENDSTDBRW } sub selectstudent_link { - my ($form,$unameele,$udomele)=@_; + my ($form,$unameele,$udomele,$courseadvonly)=@_; + my $callargs = "'".$form."','".$unameele."','".$udomele."'"; if ($env{'request.course.id'}) { if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'}) && !&Apache::lonnet::allowed('srm',$env{'request.course.id'}. '/'.$env{'request.course.sec'})) { return ''; } - return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele. - '","'.$udomele.'");'."'>".&mt('Select User')."</a>"; + if ($courseadvonly) { + $callargs .= ",'',1,1"; + } + return '<span class="LC_nobreak">'. + '<a href="javascript:openstdbrowser('.$callargs.');">'. + &mt('Select User').'</a></span>'; } if ($env{'request.role'}=~/^(au|dc|su)/) { - return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele. - '","'.$udomele.'",1);'."'>".&mt('Select User')."</a>"; + $callargs .= ",1"; + return '<span class="LC_nobreak">'. + '<a href="javascript:openstdbrowser('.$callargs.');">'. + &mt('Select User').'</a></span>'; } return ''; } sub authorbrowser_javascript { return <<"ENDAUTHORBRW"; -<script type="text/javascript"> +<script type="text/javascript" language="JavaScript"> var stdeditbrowser; function openauthorbrowser(formname,udom) { @@ -473,7 +481,7 @@ sub coursebrowser_javascript { my ($domainfilter,$sec_element,$formname)=@_; my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role'); my $output = ' -<script type="text/javascript"> +<script type="text/javascript" language="JavaScript"> var stdeditbrowser;'."\n"; $output .= <<"ENDSTDBRW"; function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) { @@ -509,6 +517,10 @@ sub coursebrowser_javascript { else { if (formname == 'portform') { url += '&setroles='+extra_element; + } else { + if (formname == 'rules') { + url += '&fixeddom='+extra_element; + } } } } @@ -602,8 +614,13 @@ function setSect(sectionlist) { sub selectcourse_link { my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_; - return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele. - '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>"; + return '<span class="LC_nobreak">' + ."<a href='" + .'javascript:opencrsbrowser("'.$form.'","'.$unameele + .'","'.$udomele.'","'.$desc.'","'.$extra_element + .'","'.$multflag.'","'.$selecttype.'");' + ."'>".&mt('Select Course').'</a>' + .'</span>'; } sub selectauthor_link { @@ -710,6 +727,21 @@ sub select_datelocale { return $output; } +sub select_language { + my ($name,$selected,$includeempty) = @_; + my %langchoices; + if ($includeempty) { + %langchoices = ('' => 'No language preference'); + } + foreach my $id (&languageids()) { + my $code = &supportedlanguagecode($id); + if ($code) { + $langchoices{$code} = &plainlanguagedescription($id); + } + } + return &select_form($selected,$name,%langchoices); +} + =pod =item * &linked_select_forms(...) @@ -796,7 +828,7 @@ sub linked_select_forms { my $first = "document.$formname.$firstselectname"; # output the javascript to do the changing my $result = ''; - $result.="<script type=\"text/javascript\">\n"; + $result.='<script type="text/javascript" language="JavaScript">'."\n"; $result.="var select2data = new Object();\n"; $" = '","'; my $debug = ''; @@ -903,9 +935,6 @@ sub help_open_topic { my ($topic, $text, $stayOnPage, $width, $height) = @_; $text = "" if (not defined $text); $stayOnPage = 0 if (not defined $stayOnPage); - if ($env{'browser.interface'} eq 'textual') { - $stayOnPage=1; - } $width = 350 if (not defined $width); $height = 400 if (not defined $height); my $filename = $topic; @@ -935,7 +964,7 @@ sub help_open_topic { $template.=' <a target="_top" href="'.$link.'" title="'.$title.'">' .'<img src="'.$helpicon.'" border="0"' .' alt="'.&mt('Help: [_1]',$topic).'"' - .' title="'.$title.'"' + .' title="'.$title.'"' .' /></a>'; if ($text ne "") { $template.='</span>'; @@ -1011,8 +1040,7 @@ sub help_open_menu { $stayOnPage = 0 if (not defined $stayOnPage); # only use pop-up help (stayOnPage == 0) # if environment.remote is on (using remote control UI) - if ($env{'browser.interface'} eq 'textual' || - $env{'environment.remote'} eq 'off' ) { + if ($env{'environment.remote'} eq 'off' ) { $stayOnPage=1; } my $output; @@ -1036,8 +1064,7 @@ sub top_nav_help { my ($text) = @_; $text = &mt($text); my $stay_on_page = - ($env{'browser.interface'} eq 'textual' || - $env{'environment.remote'} eq 'off' ); + ($env{'environment.remote'} eq 'off' ); my $link = ($stay_on_page) ? "javascript:helpMenu('display')" : "javascript:helpMenu('open')"; my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page); @@ -1054,8 +1081,7 @@ sub help_menu_js { my ($text) = @_; my $stayOnPage = - ($env{'browser.interface'} eq 'textual' || - $env{'environment.remote'} eq 'off' ); + ($env{'environment.remote'} eq 'off' ); my $width = 620; my $height = 600; @@ -1114,8 +1140,7 @@ sub help_open_bug { unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; } $text = "" if (not defined $text); $stayOnPage = 0 if (not defined $stayOnPage); - if ($env{'browser.interface'} eq 'textual' || - $env{'environment.remote'} eq 'off' ) { + if ($env{'environment.remote'} eq 'off' ) { $stayOnPage=1; } $width = 600 if (not defined $width); @@ -1159,8 +1184,7 @@ sub help_open_faq { unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; } $text = "" if (not defined $text); $stayOnPage = 0 if (not defined $stayOnPage); - if ($env{'browser.interface'} eq 'textual' || - $env{'environment.remote'} eq 'off' ) { + if ($env{'environment.remote'} eq 'off' ) { $stayOnPage=1; } $width = 350 if (not defined $width); @@ -1831,7 +1855,7 @@ sub home_server_form_item { if ($numlib > 1) { $result .= '<select name="'.$name.'" />'."\n"; if ($default) { - $result .= '<option value="default" selected>'.&mt('default'). + $result .= '<option value="default" selected="selected">'.&mt('default'). '</option>'."\n"; } foreach my $hostid (sort(keys(%servers))) { @@ -2165,7 +2189,7 @@ sub authform_kerberos { } } else { if ($authnum == 1) { - $authtype = '<input type="hidden" name="login" value="krb">'; + $authtype = '<input type="hidden" name="login" value="krb" />'; } } if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) { @@ -2174,7 +2198,7 @@ sub authform_kerberos { if (defined($in{'mode'})) { if ($in{'mode'} eq 'modifycourse') { if ($authnum == 1) { - $authtype = '<input type="hidden" name="login" value="krb">'; + $authtype = '<input type="hidden" name="login" value="krb" />'; } } } @@ -2251,7 +2275,7 @@ sub authform_internal{ } } else { if ($authnum == 1) { - $authtype = '<input type="hidden" name="login" value="int">'; + $authtype = '<input type="hidden" name="login" value="int" />'; } } if (!$can_assign{'int'}) { @@ -2260,7 +2284,7 @@ sub authform_internal{ if (defined($in{'mode'})) { if ($in{'mode'} eq 'modifycourse') { if ($authnum == 1) { - $authtype = '<input type="hidden" name="login" value="int">'; + $authtype = '<input type="hidden" name="login" value="int" />'; } } } @@ -2306,7 +2330,7 @@ sub authform_local{ } } else { if ($authnum == 1) { - $authtype = '<input type="hidden" name="login" value="loc">'; + $authtype = '<input type="hidden" name="login" value="loc" />'; } } if (!$can_assign{'loc'}) { @@ -2315,7 +2339,7 @@ sub authform_local{ if (defined($in{'mode'})) { if ($in{'mode'} eq 'modifycourse') { if ($authnum == 1) { - $authtype = '<input type="hidden" name="login" value="loc">'; + $authtype = '<input type="hidden" name="login" value="loc" />'; } } } @@ -2357,7 +2381,7 @@ sub authform_filesystem{ } } else { if ($authnum == 1) { - $authtype = '<input type="hidden" name="login" value="fsys">'; + $authtype = '<input type="hidden" name="login" value="fsys" />'; } } if (!$can_assign{'fsys'}) { @@ -2366,7 +2390,7 @@ sub authform_filesystem{ if (defined($in{'mode'})) { if ($in{'mode'} eq 'modifycourse') { if ($authnum == 1) { - $authtype = '<input type="hidden" name="login" value="fsys">'; + $authtype = '<input type="hidden" name="login" value="fsys" />'; } } } @@ -2790,6 +2814,26 @@ sub screenname { } +# ------------------------------------------------------------- Confirm Wrapper +=pod + +=item confirmwrapper + +Wrap messages about completion of operation in box + +=cut + +sub confirmwrapper { + my ($message)=@_; + if ($message) { + return "\n".'<div class="LC_confirm_box">'."\n" + .$message."\n" + .'</div>'."\n"; + } else { + return $message; + } +} + # ------------------------------------------------------------- Message Wrapper sub messagewrapper { @@ -2800,6 +2844,7 @@ sub messagewrapper { '&subject='.&escape($subject).'&text='.&escape($text).'" '. 'title="'.&mt('Send message').'">'.$link.'</a>'; } + # --------------------------------------------------------------- Notes Wrapper sub noteswrapper { @@ -2807,6 +2852,7 @@ sub noteswrapper { return "<a href='/adm/email?recordftf=retrieve&recname=$un&recdom=$do'>$link</a>"; } + # ------------------------------------------------------------- Aboutme Wrapper sub aboutmewrapper { @@ -2820,12 +2866,13 @@ sub aboutmewrapper { # ------------------------------------------------------------ Syllabus Wrapper - sub syllabuswrapper { my ($linktext,$coursedir,$domain)=@_; return qq{<a href="/public/$domain/$coursedir/syllabus">$linktext</a>}; } +# ----------------------------------------------------------------------------- + sub track_student_link { my ($linktext,$sname,$sdom,$target,$start) = @_; my $link ="/adm/trackstudent?"; @@ -2847,6 +2894,27 @@ sub track_student_link { &help_open_topic('View_recent_activity'); } +sub slot_reservations_link { + my ($linktext,$sname,$sdom,$target) = @_; + my $link ="/adm/slotrequest?command=showresv&origin=aboutme"; + my $title = 'View slot reservation history'; + if (defined($sname) && $sname !~ /^\s*$/ && + defined($sdom) && $sdom !~ /^\s*$/) { + $link .= "&uname=$sname&udom=$sdom"; + $title .= ' of this student'; + } + if (defined($target) && $target !~ /^\s*$/) { + $target = qq{target="$target"}; + } else { + $target = ''; + } + $title = &mt($title); + $linktext = &mt($linktext); + return qq{<a href="$link" title="$title" $target>$linktext</a>}; +# FIXME uncomment when help item created: &help_open_topic('Slot_Reservation_History'); + +} + # ===================================================== Display a student photo @@ -4183,7 +4251,7 @@ sub bodytag { my $font = &designparm($function.'.font',$domain); my $pgbg = $bgcolor || &designparm($function.'.pgbg',$domain); - my %design = ( 'style' => 'margin-top: 0px', + my %design = ( 'style' => 'margin-top: 0', 'bgcolor' => $pgbg, 'text' => $font, 'alink' => &designparm($function.'.alink',$domain), @@ -4219,15 +4287,7 @@ sub bodytag { if ($bodyonly) { return $bodytag; - } elsif ($env{'browser.interface'} eq 'textual') { -# Accessibility - - $bodytag.=&Apache::lonmenu::menubuttons($forcereg,$forcereg); - if (!$notitle) { - $bodytag.='<h1>LON-CAPA: '.$title.'</h1>'; - } - return $bodytag; - } + } my $name = &plainname($env{'user.name'},$env{'user.domain'}); if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') { @@ -4310,6 +4370,8 @@ ENDROLE if ($notopbar) { $bodytag .= $titletable; } else { + $bodytag .= qq|<div id="head_userinfo">$name ($role) <br/> + <em>$realm</em></div>|; if ($env{'request.state'} eq 'construct') { $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg, $titletable); @@ -4341,8 +4403,8 @@ ENDROLE return(<<ENDBODY); $bodytag <table id="LC_title_bar" class="LC_with_remote"> -<tr><td class="LC_title_bar_role_logo">$upperleft</td> - <td class="LC_title_bar_domain_logo">$messages </td> +<tr><td>$upperleft</td> + <td>$messages </td> </tr> <tr><td>$titleinfo $dc_info $menu</td> $roleinfo @@ -4459,6 +4521,8 @@ sub standard_css { my $img = &designparm($function.'.img', $domain); my $tabbg = &designparm($function.'.tabbg', $domain); my $font = &designparm($function.'.font', $domain); + my $fontmenu = &designparm($function.'.fontmenu', $domain); +#second colour for later usage my $sidebg = &designparm($function.'.sidebg',$domain); my $pgbg_or_bgcolor = $bgcolor || @@ -4492,20 +4556,27 @@ sub standard_css { my $lg_border_color = '#C8C8C8'; my $border = ($env{'browser.type'} eq 'explorer' || - $env{'browser.type'} eq 'safari' ) ? '0px 2px 0px 2px' - : '0px 3px 0px 4px'; + $env{'browser.type'} eq 'safari' ) ? '0 2px 0 2px' + : '0 3px 0 4px'; return <<END; -body{ - font-family: $sans; - line-height:130%; - font-size:0.83em; - color:$font; - } -a:link, a:visited { font-size:100%; } +body { + font-family: $sans; + line-height:130%; + font-size:0.83em; + color:$font; +} + +a:link, a:visited { + font-size:100%; +} + +a:focus { + color: red; + background: yellow +} -a:focus { color: red; background: yellow } table.thinborder, table.thinborder tr th { border-style: solid; @@ -4513,26 +4584,47 @@ table.thinborder tr th { border-color: $lg_border_color; background: $tabbg; } + table.thinborder tr td { border-style: solid; border-width: 1px; border-color: $lg_border_color; } -form, .inline { display: inline; } +form, .inline { + display: inline; +} -.LC_right {text-align:right;} -.LC_middle {vertical-align:middle;} +.LC_right { + text-align:right; +} + +.LC_middle { + vertical-align:middle; +} /* just for tests */ .LC_400Box {width:400px; } /* end */ -.LC_filename {font-family: $mono; white-space:pre;} +.LC_filename { + font-family: $mono; + white-space:pre; +} + +.LC_fileicon { + border: none; + height: 1.3em; + vertical-align: text-bottom; + margin-right: 0.3em; + text-decoration:none; +} + .LC_error { color: red; font-size: larger; } + .LC_warning, .LC_diff_removed { color: red; @@ -4543,18 +4635,33 @@ form, .inline { display: inline; } .LC_diff_added { color: green; } + +div.LC_confirm_box { + background-color: #FAFAFA; + border: 1px solid $lg_border_color; + margin-right: 0; + padding: 5px; +} + +div.LC_confirm_box .LC_error img, +div.LC_confirm_box .LC_success img { + vertical-align: middle; +} + .LC_unknown { color: yellow; } .LC_icon { border: none; + vertical-align: middle; } .LC_indexer_icon { - border: 0px; + border: none; height: 22px; } + .LC_docs_spacer { width: 25px; height: 1px; @@ -4565,122 +4672,187 @@ form, .inline { display: inline; } color: #999999; } +.LC_discussion { + background: $tabbg; + border: 1px solid black; + margin: 2px; +} + +.LC_disc_action_links_bar { + background: $tabbg; + font-family: $sans; + border: none; + margin: 4px; +} + +.LC_disc_action_left { + text-align: left; +} + +.LC_disc_action_right { + text-align: right; +} + +.LC_disc_new_item { + background: white; + border: 2px solid red; + margin: 2px; +} + +.LC_disc_old_item { + background: white; + border: 1px solid black; + margin: 2px; +} + table.LC_pastsubmission { border: 1px solid black; margin: 2px; } -table#LC_top_nav, table#LC_menubuttons,table#LC_nav_location { +table#LC_top_nav, +table#LC_menubuttons, +table#LC_nav_location { width: 100%; background: $pgbg; border: 2px; border-collapse: separate; - padding: 0px; + padding: 0; } -table#LC_title_bar, table.LC_breadcrumbs, +table#LC_title_bar a { + color: $fontmenu; +} + +table#LC_title_bar { + /*display: none;*/ +} + +table#LC_title_bar, +table.LC_breadcrumbs, table#LC_title_bar.LC_with_remote { width: 100%; border-color: $pgbg; border-style: solid; border-width: $border; - background: $pgbg; + color: $fontmenu; font-family: $sans; border-collapse: collapse; - padding: 0px; + padding: 0; } + table.LC_docs_path { width: 100%; border: 0; background: $pgbg; font-family: $sans; border-collapse: collapse; - padding: 0px; + padding: 0; } table#LC_title_bar td { background: $tabbg; } + table#LC_title_bar .LC_title_bar_who { background: $tabbg; - color: $font; + color: $fontmenu; font: small $sans; text-align: right; - margin: 0px; + margin: 0; } + table#LC_title_bar .LC_title_bar_name { - margin: 0px; + margin: 0; } + table#LC_title_bar .LC_title_bar_role { - margin: 0px; + margin: 0; } -table#LC_title_bar .LC_tite_bar_realm { - margin: 0px; + +table#LC_title_bar .LC_title_bar_realm { + margin: 0; } + span.LC_metadata { - font-family: $sans; -} -table#LC_title_bar td.LC_title_bar_domain_logo { - background: $sidebg; - text-align: right; - padding: 0px; -} -table#LC_title_bar td.LC_title_bar_role_logo { - background: $sidebg; - padding: 0px; + font-family: $sans; } table#LC_menubuttons img{ - border: 0px; + border: none; } + table#LC_top_nav td { background: $tabbg; - border: 0px; + border: none; font-size: small; vertical-align:top; padding:2px 5px 2px 5px; } -table#LC_top_nav td a, div#LC_top_nav a { + +table#LC_top_nav td a, +div#LC_top_nav a { color: $font; font-family: $sans; } + table#LC_top_nav td.LC_top_nav_logo { background: $tabbg; text-align: left; white-space: nowrap; width: 31px; } + table#LC_top_nav td.LC_top_nav_logo img { - border: 0px; + border: none; vertical-align: bottom; } + +table#LC_top_nav td.LC_top_nav_exit, +table#LC_top_nav td.LC_top_nav_help { + width: 2.0em; +} + table#LC_top_nav td.LC_top_nav_login { width: 4.0em; text-align: center; } -table.LC_breadcrumbs td, table.LC_docs_path td { + +table.LC_breadcrumbs td, +table.LC_docs_path td { background: $tabbg; - color: $font; + color: $fontmenu; font-family: $sans; font-size: smaller; } + +table.LC_breadcrumbs td.LC_breadcrumbs_component, +table.LC_docs_path td.LC_docs_path_component { + background: $tabbg; + color: $fontmenu; + font-family: $sans; + font-size: larger; + text-align: right; +} + td.LC_table_cell_checkbox { text-align: center; } -.LC_fontsize_small -{ +table#LC_mainmenu td.LC_mainmenu_column { + vertical-align: top; +} + +.LC_fontsize_small { font-size: 70%; } -.LC_fontsize_medium -{ +.LC_fontsize_medium { font-size: 85%; } -.LC_fontsize_large -{ +.LC_fontsize_large { font-size: 120%; } @@ -4694,7 +4866,7 @@ td.LC_table_cell_checkbox { .LC_menubuttons_link { text-decoration: none; } -/*2008--9-5: new menu style sheet.Changed category*/ + .LC_menubuttons_category { color: $font; background: $pgbg; @@ -4704,22 +4876,20 @@ td.LC_table_cell_checkbox { } td.LC_menubuttons_text { - color: $font; + color: $font; } - - .LC_current_location { font-family: $sans; background: $tabbg; } + .LC_new_mail { font-family: $sans; background: $tabbg; font-weight: bold; } - .LC_dropadd_labeltext { font-family: $sans; text-align: right; @@ -4739,61 +4909,76 @@ td.LC_menubuttons_text { } table.LC_aboutme_port { - border: 0px; + border: none; border-collapse: collapse; - border-spacing: 0px; + border-spacing: 0; } -table.LC_data_table, table.LC_mail_list { + +table.LC_data_table, +table.LC_mail_list { border: 1px solid #000000; border-collapse: separate; border-spacing: 1px; background: $pgbg; } + .LC_data_table_dense { font-size: small; } + table.LC_nested_outer { border: 1px solid #000000; border-collapse: collapse; - border-spacing: 0px; + border-spacing: 0; width: 100%; } + table.LC_nested { - border: 0px; + border: none; border-collapse: collapse; - border-spacing: 0px; + border-spacing: 0; width: 100%; } -table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th, + +table.LC_data_table tr th, +table.LC_calendar tr th, +table.LC_mail_list tr th, table.LC_prior_tries tr th { font-weight: bold; background-color: $data_table_head; + color:$fontmenu; font-size:90%; } + table.LC_data_table tr.LC_info_row > td { background-color: #CCCCCC; font-weight: bold; text-align: left; } -table.LC_data_table tr.LC_odd_row > td, + +table.LC_data_table tr.LC_odd_row > td, table.LC_pick_box tr > td.LC_odd_row, table.LC_aboutme_port tr td { background-color: $data_table_light; padding: 2px; } + table.LC_data_table tr.LC_even_row > td, table.LC_pick_box tr > td.LC_even_row, table.LC_aboutme_port tr.LC_even_row td { background-color: $data_table_dark; padding: 2px; } + table.LC_data_table tr.LC_data_table_highlight td { background-color: $data_table_darker; } + table.LC_data_table tr td.LC_leftcol_header { background-color: $data_table_head; font-weight: bold; } + table.LC_data_table tr.LC_empty_row td, table.LC_nested tr.LC_empty_row td { background-color: #FFFFFF; @@ -4802,15 +4987,19 @@ table.LC_nested tr.LC_empty_row td { text-align: center; padding: 8px; } + table.LC_nested tr.LC_empty_row td { padding: 4ex } + table.LC_nested_outer tr th { font-weight: bold; + color:$fontmenu; background-color: $data_table_head; font-size: small; border-bottom: 1px solid #000000; } + table.LC_nested_outer tr td.LC_subheader { background-color: $data_table_head; font-weight: bold; @@ -4818,20 +5007,24 @@ table.LC_nested_outer tr td.LC_subheader border-bottom: 1px solid #000000; text-align: right; } + table.LC_nested tr.LC_info_row td { background-color: #CCCCCC; font-weight: bold; font-size: small; text-align: center; } + table.LC_nested tr.LC_info_row td.LC_left_item, table.LC_nested_outer tr th.LC_left_item { text-align: left; } + table.LC_nested td { background-color: #FFFFFF; font-size: small; } + table.LC_nested_outer tr th.LC_right_item, table.LC_nested tr.LC_info_row td.LC_right_item, table.LC_nested tr.LC_odd_row td.LC_right_item, @@ -4860,48 +5053,81 @@ table.LC_calendar { border: 1px solid #000000; border-collapse: collapse; } + table.LC_calendar_pickdate { font-size: xx-small; } + table.LC_calendar tr td { border: 1px solid #000000; vertical-align: top; } + table.LC_calendar tr td.LC_calendar_day_empty { background-color: $data_table_dark; } +table.LC_calendar tr td.LC_calendar_day_current { + background-color: $data_table_highlight; +} + table.LC_mail_list tr.LC_mail_new { background-color: $mail_new; } + table.LC_mail_list tr.LC_mail_new:hover { background-color: $mail_new_hover; } + +table.LC_mail_list tr.LC_mail_even { +} + +table.LC_mail_list tr.LC_mail_odd { +} + table.LC_mail_list tr.LC_mail_read { background-color: $mail_read; } + table.LC_mail_list tr.LC_mail_read:hover { background-color: $mail_read_hover; } + table.LC_mail_list tr.LC_mail_replied { background-color: $mail_replied; } + table.LC_mail_list tr.LC_mail_replied:hover { background-color: $mail_replied_hover; } + table.LC_mail_list tr.LC_mail_other { background-color: $mail_other; } + table.LC_mail_list tr.LC_mail_other:hover { background-color: $mail_other_hover; } -table.LC_data_table tr > td.LC_browser_file { +table.LC_data_table tr > td.LC_browser_file, +table.LC_data_table tr > td.LC_browser_file_published { background: #CCFF88; } -table.LC_data_table tr > td.LC_browser_file_locked { + +table.LC_data_table tr > td.LC_browser_file_locked, +table.LC_data_table tr > td.LC_browser_file_unpublished { background: #FFAA99; } + +table.LC_data_table tr > td.LC_browser_file_obsolete { + background: #AAAAAA; +} + +table.LC_data_table tr > td.LC_browser_file_modified, +table.LC_data_table tr > td.LC_browser_file_metamodified { + background: #FFFF77; +} + table.LC_data_table tr.LC_browser_folder > td { background: #CCCCFF; } @@ -4909,18 +5135,23 @@ table.LC_data_table tr.LC_browser_folder table.LC_data_table tr > td.LC_roles_is { /* background: #77FF77; */ } + table.LC_data_table tr > td.LC_roles_future { background: #FFFF77; } + table.LC_data_table tr > td.LC_roles_will { background: #FFAA77; } + table.LC_data_table tr > td.LC_roles_expired { background: #FF7777; } + table.LC_data_table tr > td.LC_roles_will_not { background: #AAFF77; } + table.LC_data_table tr > td.LC_roles_selected { background: #11CC55; } @@ -4934,58 +5165,70 @@ span.LC_parm_menu_item { font-size: larger; font-family: $sans; } + span.LC_parm_scope_all { color: red; } + span.LC_parm_scope_folder { color: green; } + span.LC_parm_scope_resource { color: orange; } + span.LC_parm_part { color: blue; } + span.LC_parm_folder, span.LC_parm_symb { font-size: x-small; font-family: $mono; color: #AAAAAA; } -td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu, -td.LC_parm_overview_parm_selectors { +td.LC_parm_overview_level_menu, +td.LC_parm_overview_map_menu, +td.LC_parm_overview_parm_selectors, +td.LC_parm_overview_restrictions { border: 1px solid black; border-collapse: collapse; } + table.LC_parm_overview_restrictions td { border-width: 1px 4px 1px 4px; border-style: solid; border-color: $pgbg; text-align: center; } + table.LC_parm_overview_restrictions th { background: $tabbg; border-width: 1px 4px 1px 4px; border-style: solid; border-color: $pgbg; } + table#LC_helpmenu { - border: 0px; + border: none; height: 55px; - border-spacing: 0px; + border-spacing: 0; } table#LC_helpmenu fieldset legend { font-size: larger; font-weight: bold; } + table#LC_helpmenu_links { width: 100%; border: 1px solid black; background: $pgbg; - padding: 0px; + padding: 0; border-spacing: 1px; } + table#LC_helpmenu_links tr td { padding: 1px; background: $tabbg; @@ -4993,11 +5236,13 @@ table#LC_helpmenu_links tr td { font-weight: bold; } -table#LC_helpmenu_links a:link, table#LC_helpmenu_links a:visited, +table#LC_helpmenu_links a:link, +table#LC_helpmenu_links a:visited, table#LC_helpmenu_links a:active { text-decoration: none; color: $font; } + table#LC_helpmenu_links a:hover { text-decoration: underline; color: $vlink; @@ -5007,20 +5252,24 @@ table#LC_helpmenu_links a:hover { border: 1px solid #339933; margin: -1px; } + .LC_chrt_popup_up { border: 1px solid yellow; margin: -1px; } + .LC_chrt_popup { border: 1px solid #8888FF; background: #CCCCFF; } + table.LC_pick_box { border-collapse: separate; background: white; border: 1px solid black; border-spacing: 1px; } + table.LC_pick_box td.LC_pick_box_title { background: $tabbg; font-weight: bold; @@ -5029,6 +5278,7 @@ table.LC_pick_box td.LC_pick_box_title { width: 184px; padding: 8px; } + table.LC_pick_box td.LC_selfenroll_pick_box_title { background: $tabbg; font-weight: bold; @@ -5041,28 +5291,34 @@ table.LC_pick_box td.LC_pick_box_value { text-align: left; padding: 8px; } + table.LC_pick_box td.LC_pick_box_select { text-align: left; padding: 8px; } + table.LC_pick_box td.LC_pick_box_separator { - padding: 0px; + padding: 0; height: 1px; background: black; } + table.LC_pick_box td.LC_pick_box_submit { text-align: right; } + table.LC_pick_box td.LC_evenrow_value { text-align: left; padding: 8px; background-color: $data_table_light; } + table.LC_pick_box td.LC_oddrow_value { text-align: left; padding: 8px; background-color: $data_table_light; } + table.LC_helpform_receipt { width: 620px; border-collapse: separate; @@ -5070,6 +5326,7 @@ table.LC_helpform_receipt { border: 1px solid black; border-spacing: 1px; } + table.LC_helpform_receipt td.LC_pick_box_title { background: $tabbg; font-weight: bold; @@ -5077,51 +5334,61 @@ table.LC_helpform_receipt td.LC_pick_box width: 184px; padding: 8px; } + table.LC_helpform_receipt td.LC_evenrow_value { text-align: left; padding: 8px; background-color: $data_table_light; } + table.LC_helpform_receipt td.LC_oddrow_value { text-align: left; padding: 8px; background-color: $data_table_light; } + table.LC_helpform_receipt td.LC_pick_box_separator { - padding: 0px; + padding: 0; height: 1px; background: black; } + span.LC_helpform_receipt_cat { font-weight: bold; } + table.LC_group_priv_box { background: white; border: 1px solid black; border-spacing: 1px; } + table.LC_group_priv_box td.LC_pick_box_title { background: $tabbg; font-weight: bold; text-align: right; width: 184px; } + table.LC_group_priv_box td.LC_groups_fixed { background: $data_table_light; text-align: center; } + table.LC_group_priv_box td.LC_groups_optional { background: $data_table_dark; text-align: center; } + table.LC_group_priv_box td.LC_groups_functionality { background: $data_table_darker; text-align: center; font-weight: bold; } + table.LC_group_priv td { text-align: left; - padding: 0px; + padding: 0; } table.LC_notify_front_page { @@ -5129,12 +5396,15 @@ table.LC_notify_front_page { border: 1px solid black; padding: 8px; } + table.LC_notify_front_page td { padding: 8px; } + .LC_navbuttons { margin: 2ex 0ex 2ex 0ex; } + .LC_topic_bar { font-family: $sans; font-weight: bold; @@ -5142,35 +5412,38 @@ table.LC_notify_front_page td { background: $tabbg; vertical-align: middle; margin: 2ex 0ex 2ex 0ex; + padding: 3px; } + .LC_topic_bar span { vertical-align: middle; } + .LC_topic_bar img { vertical-align: bottom; } + table.LC_course_group_status { margin: 20px; } + table.LC_status_selector td { vertical-align: top; text-align: center; padding: 4px; } -table.LC_descriptive_input td.LC_description { - vertical-align: top; - text-align: right; - font-weight: bold; -} + div.LC_feedback_link { clear: both; background: white; - width: 100%; + width: 100%; } + span.LC_feedback_link { background: $feedback_link_bg; font-size: larger; } + span.LC_message_link { background: $feedback_link_bg; font-size: larger; @@ -5189,24 +5462,48 @@ table.LC_prior_tries td { } .LC_answer_correct { - background: #AAFFAA; - color: black; + background: lightgreen; + font-family: $sans; + color: darkgreen; + padding: 6px; } + .LC_answer_charged_try { - background: #FFAAAA ! important; - color: black; + background: #FFAAAA; + font-family: $sans; + color: darkred; + padding: 6px; } -.LC_answer_not_charged_try, + +.LC_answer_not_charged_try, .LC_answer_no_grade, .LC_answer_late { - background: #FFFFAA; + background: lightyellow; + font-family: $sans; color: black; + padding: 6px; } + .LC_answer_previous { - background: #AAAAFF; + background: lightblue; + font-family: $sans; + color: darkblue; + padding: 6px; +} + +.LC_answer_no_message { + background: #FFFFFF; + font-family: $sans; color: black; + padding: 6px; } +.LC_answer_unknown { + background: orange; + font-family: $sans; + color: black; + padding: 6px; +} span.LC_prior_numerical, span.LC_prior_string, @@ -5226,9 +5523,12 @@ table.LC_prior_option { width: 100%; border-collapse: collapse; } -table.LC_prior_rank, table.LC_prior_match { + +table.LC_prior_rank, +table.LC_prior_match { border-collapse: collapse; } + table.LC_prior_option tr td, table.LC_prior_rank tr td, table.LC_prior_match tr td { @@ -5251,12 +5551,17 @@ span.LC_cusr_subheading { table.LC_docs_documents { background: #BBBBBB; - border-width: 0px; + border-width: 0; border-collapse: collapse; } +table.LC_docs_documents td.LC_docs_document { + border: 2px solid black; + padding: 4px; +} + .LC_docs_entry_move { - border: 0px; + border: none; border-collapse: collapse; } @@ -5269,15 +5574,19 @@ table.LC_docs_documents { background: #DDDDDD; font-size: x-small; } + .LC_docs_copy { color: #000099; } + .LC_docs_cut { color: #550044; } + .LC_docs_rename { color: #009900; } + .LC_docs_remove { color: #990000; } @@ -5291,6 +5600,7 @@ table.LC_docs_documents { .LC_docs_editor td.LC_docs_entry_icon { background: #FFFFBB; } + .LC_docs_editor td.LC_docs_entry_parameter { background: #BBBBFF; font-size: x-small; @@ -5307,12 +5617,13 @@ table.LC_docs_adddocs th { table.LC_sty_begin { background: #BBFFBB; } + table.LC_sty_end { background: #FFBBBB; } table.LC_double_column { - border-width: 0px; + border-width: 0; border-collapse: collapse; width: 100%; padding: 2px; @@ -5327,7 +5638,7 @@ table.LC_double_column tr td.LC_left_col table.LC_double_column tr td.LC_right_col { top: 2px; - right: 2px; + right: 2px; width: 47%; vertical-align: top; } @@ -5351,17 +5662,18 @@ div.LC_clear_float_footer { clear: both; } - div.LC_grade_show_user { margin-top: 20px; border: 1px solid black; } + div.LC_grade_user_name { background: #DDDDEE; border-bottom: 1px solid black; font-weight: bold; font-size: large; } + div.LC_grade_show_user_odd_row div.LC_grade_user_name { background: #DDEEDD; } @@ -5375,6 +5687,7 @@ div.LC_grade_assign { width: 99%; background: #FFFFFF; } + div.LC_grade_show_problem_header, div.LC_grade_submissions_header, div.LC_grade_message_center_header, @@ -5382,6 +5695,7 @@ div.LC_grade_assign_header { font-weight: bold; font-size: large; } + div.LC_grade_show_problem_problem, div.LC_grade_submissions_body, div.LC_grade_message_center_body, @@ -5390,6 +5704,7 @@ div.LC_grade_assign_body { width: 99%; background: #FFFFFF; } + span.LC_grade_check_note { font-weight: normal; font-size: medium; @@ -5401,16 +5716,19 @@ span.LC_grade_check_note { table.LC_scantron_action { width: 100%; } + table.LC_scantron_action tr th { font-weight:bold; font-style:normal; } -.LC_edit_problem_header, + +.LC_edit_problem_header, div.LC_edit_problem_footer { font-weight: normal; font-size: medium; margin: 2px; } + div.LC_edit_problem_header, div.LC_edit_problem_header div, div.LC_edit_problem_footer, @@ -5419,17 +5737,20 @@ div.LC_edit_problem_editxml_header, div.LC_edit_problem_editxml_header div { margin-top: 5px; } + div.LC_edit_problem_header_edit_row { background: $tabbg; padding: 3px; margin-bottom: 5px; } + div.LC_edit_problem_header_title { font-weight: bold; font-size: larger; background: $tabbg; padding: 3px; } + table.LC_edit_problem_header_title { font-size: larger; font-weight: bold; @@ -5437,36 +5758,37 @@ table.LC_edit_problem_header_title { border-color: $pgbg; border-style: solid; border-width: $border; - background: $tabbg; border-collapse: collapse; - padding: 0px + padding: 0; } div.LC_edit_problem_discards { float: left; padding-bottom: 5px; } + div.LC_edit_problem_saves { float: right; padding-bottom: 5px; } + hr.LC_edit_problem_divide { clear: both; color: $tabbg; background-color: $tabbg; height: 3px; - border: 0px; + border: none; } + img.stift{ - border-width:0; - vertical-align:middle; + border-width: 0; + vertical-align: middle; } table#LC_mainmenu{ margin-top:10px; width:80%; - } table#LC_mainmenu td.LC_mainmenu_col_fieldset{ @@ -5474,6 +5796,14 @@ table#LC_mainmenu td.LC_mainmenu_col_fie width: 45%; } +.LC_mainmenu_fieldset_category { + color: $font; + background: $pgbg; + font-family: $sans; + font-size: small; + font-weight: bold; +} + div.LC_createcourse { margin: 10px 10px 10px 10px; } @@ -5491,30 +5821,32 @@ ol#LC_MenuBreadcrumbs a:hover, ol#LC_PathBreadcrumbs a:hover, ul#LC_TabMainMenuContent a:hover, .LC_FormSectionClearButton input:hover -ul.LC_TabContent li:hover a{ +ul.LC_TabContent li:hover a { color:#BF2317; text-decoration:none; } -h1 { +h1 { padding:5px 10px 5px 20px; line-height:130%; } -h2,h3,h4,h5,h6 -{ - margin:5px 0px 5px 0px; - padding:0px; +h2,h3,h4,h5,h6 { + margin: 5px 0 5px 0; + padding: 0; line-height:130%; } -.LC_hcell{ + +.LC_hcell { padding:3px 15px 3px 15px; - margin:0px; + margin: 0; background-color:$tabbg; - border-bottom:solid 1px $lg_border_color; + color:$fontmenu; + border-bottom:solid 1px $lg_border_color; } + .LC_noBorder { - border:0px; + border: 0; } @@ -5522,17 +5854,13 @@ h2,h3,h4,h5,h6 .LC_Right { float: right; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } -p, .LC_ContentBox { - padding: 10px; - -} .LC_FormSectionClearButton input { - background-color:transparent; - border:0px; + background-color:transparent; + border: none; cursor:pointer; text-decoration:underline; } @@ -5544,19 +5872,35 @@ p, .LC_ContentBox { padding: 4px; border: 1px solid #000033; white-space: nowrap; +/* vertical-align: middle; */ } dl,ul,div,fieldset { - margin: 10px 10px 10px 0px; - overflow:hidden; + margin: 10px 10px 10px 0; +/* overflow: hidden; */ +} + +#head_userinfo { + float: left; + margin: 0; +} + +#head_userinfo em{ + font-weight: bold; + font-style: normal; +} + +ol.LC_smallMenu { + float: right; } + ol.LC_smallMenu, ol#LC_PathBreadcrumbs { - margin: 0px; + margin: 0; } ol.LC_smallMenu li { display: inline; - padding: 5px 5px 0px 10px; + padding: 5px 5px 0 10px; vertical-align: top; } @@ -5569,23 +5913,31 @@ ol.LC_smallMenu a { color: RGB(80, 80, 80); text-decoration: none; } -ol#LC_TabMainMenuContent, ul.LC_TabContent , + +ol#LC_TabMainMenuContent { + clear: both; +} + +ol#LC_TabMainMenuContent, +ul.LC_TabContent , ul.LC_TabContentBigger { display:block; list-style:none; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } -ol#LC_TabMainMenuContent li, ul.LC_TabContent li, -ul.LC_TabContentBigger li{ +ol#LC_TabMainMenuContent li, +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; } -ol#LC_TabMainMenuContent li{ + +ol#LC_TabMainMenuContent li { vertical-align: bottom; border-bottom: solid 1px RGB(175, 175, 175); padding: 5px 10px 5px 10px; @@ -5595,32 +5947,37 @@ ol#LC_TabMainMenuContent li{ background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; } -ol#LC_TabMainMenuContent li a{ +ol#LC_TabMainMenuContent li a { color: RGB(47, 47, 47); text-decoration: none; } + ul.LC_TabContent { min-height:1.6em; } -ul.LC_TabContent li{ + +ul.LC_TabContent li { vertical-align:middle; - padding:0px 10px 0px 10px; + padding: 0 10px 0 10px; background-color:$tabbg; border-bottom:solid 1px $lg_border_color; } -ul.LC_TabContent li a, ul.LC_TabContent li{ + +ul.LC_TabContent li a, ul.LC_TabContent li { color:rgb(47,47,47); text-decoration:none; font-size:95%; font-weight:bold; padding-right: 16px; } -ul.LC_TabContent li:hover, ul.LC_TabContent li.active{ + +ul.LC_TabContent li:hover, ul.LC_TabContent li.active { background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center; border-bottom:solid 1px #FFFFFF; padding-right: 16px; } -ul.LC_TabContentBigger li{ + +ul.LC_TabContentBigger li { vertical-align:bottom; border-top:solid 1px $lg_border_color; border-left:solid 1px $lg_border_color; @@ -5628,63 +5985,77 @@ ul.LC_TabContentBigger li{ margin-left:2px; background:url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; } -ul.LC_TabContentBigger li:hover, ul.LC_TabContentBigger li.active{ + +ul.LC_TabContentBigger li:hover, +ul.LC_TabContentBigger li.active { background:url(/adm/lonIcons/lightGreyBG.png) repeat-x right bottom; } -ul.LC_TabContentBigger li, ul.LC_TabContentBigger li a{ + +ul.LC_TabContentBigger li, +ul.LC_TabContentBigger li a { font-size:110%; font-weight:bold; } -ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs { +ol#LC_MenuBreadcrumbs, +ol#LC_PathBreadcrumbs, +ul.LC_CourseBreadcrumbs { border-top: solid 1px RGB(255, 255, 255); height: 20px; line-height: 20px; vertical-align: bottom; - margin: 0px 0px 30px 0px; + margin: 0 0 30px 0; padding-left: 10px; list-style-position: inside; background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; } -ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li { +ol#LC_MenuBreadcrumbs li, +ol#LC_PathBreadcrumbs li, +ul.LC_CourseBreadcrumbs li { /* background: url(/adm/lonIcons/arrow_white.png) no-repeat left center; -*/ +*/ display: inline; - padding: 0px 0px 0px 10px; - vertical-align: bottom; + padding: 0 0 0 10px; +/* vertical-align: bottom; */ overflow:hidden; } -ol#LC_MenuBreadcrumbs li a { +ol#LC_MenuBreadcrumbs li a, ul.LC_CourseBreadcrumbs li a { text-decoration: none; font-size:90%; } -ol#LC_PathBreadcrumbs li a{ + +ol#LC_PathBreadcrumbs li a { text-decoration:none; font-size:100%; font-weight:bold; } -.LC_ContentBoxSpecial -{ + +.LC_BoxPadding { + padding: 10px; +} + +.LC_ContentBoxSpecial { border: solid 1px $lg_border_color; } -.LC_ContentBoxSpecialContactInfo -{ + +.LC_ContentBoxSpecialContactInfo { border: solid 1px $lg_border_color; max-width:25%; min-width:25%; } -.LC_AboutMe_Image -{ + +.LC_AboutMe_Image { float:left; margin-right:10px; } -.LC_Clear_AboutMe_Image -{ + +.LC_Clear_AboutMe_Image { clear:left; } + dl.LC_ListStyleClean dt { padding-right: 5px; display: table-header-group; @@ -5697,13 +6068,13 @@ dl.LC_ListStyleClean dd { .LC_ListStyleClean, .LC_ListStyleSimple, .LC_ListStyleNormal, -.LC_ListStyleSpecial - { +.LC_ListStyle_Border, +.LC_ListStyleSpecial { /*display:block; */ list-style-position: inside; list-style-type: none; overflow: hidden; - padding: 0px; + padding: 0; } .LC_ListStyleSimple li, @@ -5711,21 +6082,20 @@ dl.LC_ListStyleClean dd { .LC_ListStyleNormal li, .LC_ListStyleNormal dd, .LC_ListStyleSpecial li, -.LC_ListStyleSpecial dd - { - margin: 0px; +.LC_ListStyleSpecial dd { + margin: 0; padding: 5px 5px 5px 10px; clear: both; } .LC_ListStyleClean li, .LC_ListStyleClean dd { - padding-top: 0px; - padding-bottom: 0px; + padding-top: 0; + padding-bottom: 0; } .LC_ListStyleSimple dd, -.LC_ListStyleSimple li{ +.LC_ListStyleSimple li { border-bottom: solid 1px $lg_border_color; } @@ -5739,13 +6109,14 @@ dl.LC_ListStyleClean dd { table.LC_SimpleTable { margin:5px; border:solid 1px $lg_border_color; - } +} table.LC_SimpleTable tr { - padding:0px; + padding: 0; border:solid 1px $lg_border_color; } -table.LC_SimpleTable thead{ + +table.LC_SimpleTable thead { background:rgb(220,220,220); } @@ -5753,40 +6124,39 @@ div.LC_columnSection { display: block; clear: both; overflow: hidden; - margin:0px; + margin: 0; } div.LC_columnSection>* { float: left; - margin: 10px 20px 10px 0px; + margin: 10px 20px 10px 0; overflow:hidden; } -.ContentBoxSpecialTemplate -{ +.ContentBoxSpecialTemplate { border: solid 1px $lg_border_color; } + .ContentBoxTemplate { padding:10px; } div.LC_columnSection > .ContentBoxTemplate, -div.LC_columnSection > .ContentBoxSpecialTemplate - { +div.LC_columnSection > .ContentBoxSpecialTemplate { width: 600px; } -.clear{ +.clear { clear: both; - line-height: 0px; - font-size: 0px; - height: 0px; + line-height: 0; + font-size: 0; + height: 0; } .LC_loginpage_container { text-align:left; margin : 0 auto; - width:65%; + width:90%; padding: 10px; height: auto; background-color:#FFFFFF; @@ -5797,30 +6167,24 @@ div.LC_columnSection > .ContentBoxSpecia .LC_loginpage_loginContainer { float:left; width: 182px; + padding: 2px; border:1px solid #CCCCCC; background-color:$loginbg; } -.LC_loginpage_loginContainer h2{ - margin-top:0; +.LC_loginpage_loginContainer h2 { + margin-top: 0; display:block; background:$bgcol; color:$textcol; padding-left:5px; } + .LC_loginpage_loginInfo { - margin-left:20px; float:left; - width:30%; + width:182px; border:1px solid #CCCCCC; - padding:10px; -} - -.LC_loginpage_loginDomain { - margin-right:20px; - width:20%; - float:left; - padding:10px; + padding:2px; } .LC_loginpage_space { @@ -5829,18 +6193,30 @@ div.LC_columnSection > .ContentBoxSpecia border-bottom: 1px solid #CCCCCC; } -table em{ +.LC_loginpage_floatLeft { + float: left; + width: 200px; + margin: 0; +} + +table em { font-weight: bold; font-style: normal; } -table.LC_tableBrowseRes, -table.LC_tableOfContent{ + +table.LC_tableBrowseRes, +table.LC_tableOfContent { border:none; border-spacing: 1; padding: 3px; background-color: #FFFFFF; font-size: 90%; } + +table.LC_tableOfContent{ + border-collapse: collapse; +} + table.LC_tableBrowseRes a, table.LC_tableOfContent a { background-color: transparent; @@ -5852,78 +6228,86 @@ table.LC_tableOfContent tr.LC_trOdd{ background-color: #EEEEEE; } -table.LC_tableOfContent img{ +table.LC_tableOfContent img { border: none; height: 1.3em; vertical-align: text-bottom; margin-right: 0.3em; } -a#LC_content_toolbar_firsthomework{ +a#LC_content_toolbar_firsthomework { background-image:url(/res/adm/pages/open-first-problem.gif); } -a#LC_content_toolbar_launchnav{ +a#LC_content_toolbar_launchnav { background-image:url(/res/adm/pages/start-navigation.gif); } -a#LC_content_toolbar_closenav{ +a#LC_content_toolbar_closenav { background-image:url(/res/adm/pages/close-navigation.gif); } -a#LC_content_toolbar_everything{ +a#LC_content_toolbar_everything { background-image:url(/res/adm/pages/show-all.gif); } -a#LC_content_toolbar_uncompleted{ +a#LC_content_toolbar_uncompleted { background-image:url(/res/adm/pages/show-incomplete-problems.gif); } -#LC_content_toolbar_clearbubbles{ +#LC_content_toolbar_clearbubbles { background-image:url(/res/adm/pages/mark-discussionentries-read.gif); } -a#LC_content_toolbar_changefolder{ +a#LC_content_toolbar_changefolder { background : url(/res/adm/pages/close-all-folders.gif) top center ; } -a#LC_content_toolbar_changefolder_toggled{ +a#LC_content_toolbar_changefolder_toggled { background-image:url(/res/adm/pages/open-all-folders.gif); } -ul#LC_toolbar li a:hover{ +ul#LC_toolbar li a:hover { background-position: bottom center; } -ul#LC_toolbar{ - padding:0; +ul#LC_toolbar { + padding: 0; margin: 2px; list-style:none; position:relative; background-color:white; } -ul#LC_toolbar li{ +ul#LC_toolbar li { border:1px solid white; - padding:0; + padding: 0; margin: 0; - float: left; + float: left; display:inline; vertical-align:middle; -} +} + -a.LC_toolbarItem{ +a.LC_toolbarItem { display:block; - padding:0; - margin:0; + padding: 0; + margin: 0; height: 32px; width: 32px; - color:white; - border:0 none; + color:white; + border: none; background-repeat:no-repeat; background-color:transparent; } +ul.LC_functionslist li { + float: left; + white-space: nowrap; + height: 35px; /* at least as high as heighest list item */ + margin: 0 15px 15px 10px; +} + END } @@ -6959,6 +7343,8 @@ If the user's status includes multiple t the largest default quota which applies to the user determines the default quota returned. +=back + =cut ############################################### @@ -7150,12 +7536,17 @@ sub user_picker { if ($cancreate) { $new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" /> </p>'; } else { - my $helplink = ' href="javascript:helpMenu('."'display'".')"'; + my $helplink = 'javascript:helpMenu('."'display'".')'; my %usertypetext = ( official => 'institutional', unofficial => 'non-institutional', ); - $new_user_create = '<br /><span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />'; + $new_user_create = '<p class="LC_warning">' + .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.") + .' ' + .&mt('Please contact the [_1]helpdesk[_2] for assistance.' + ,'<a href="'.$helplink.'">','</a>') + .'</p><br />'; } } } @@ -7507,8 +7898,57 @@ sub get_institutional_codes { =pod +=head1 Slot Helpers + +=over 4 + +=item * sorted_slots() + +Sorts an array of slot names in order of slot start time (earliest first). + +Inputs: + +=over 4 + +slotsarr - Reference to array of unsorted slot names. + +slots - Reference to hash of hash, where outer hash keys are slot names. + +=back + +Returns: + +=over 4 + +sorted - An array of slot names sorted by the start time of the slot. + +=back + =back +=cut + + +sub sorted_slots { + my ($slotsarr,$slots) = @_; + my @sorted; + if ((ref($slotsarr) eq 'ARRAY') && (ref($slots) eq 'HASH')) { + @sorted = + sort { + if (ref($slots->{$a}) && ref($slots->{$b})) { + return $slots->{$a}{'starttime'} <=> $slots->{$b}{'starttime'} + } + if (ref($slots->{$a})) { return -1;} + if (ref($slots->{$b})) { return 1;} + return 0; + } @{$slotsarr}; + } + return @sorted; +} + + +=pod + =head1 HTTP Helpers =over 4