--- loncom/interface/loncommon.pm 2009/04/28 21:54:57 1.798 +++ loncom/interface/loncommon.pm 2009/05/05 16:01:50 1.802 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.798 2009/04/28 21:54:57 tempelho Exp $ +# $Id: loncommon.pm,v 1.802 2009/05/05 16:01:50 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -517,6 +517,10 @@ sub coursebrowser_javascript { else { if (formname == 'portform') { url += '&setroles='+extra_element; + } else { + if (formname == 'rules') { + url += '&fixeddom='+extra_element; + } } } } @@ -2810,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".'
'."\n" + .$message."\n" + .'
'."\n"; + } else { + return $message; + } +} + # ------------------------------------------------------------- Message Wrapper sub messagewrapper { @@ -2820,6 +2844,7 @@ sub messagewrapper { '&subject='.&escape($subject).'&text='.&escape($text).'" '. 'title="'.&mt('Send message').'">'.$link.''; } + # --------------------------------------------------------------- Notes Wrapper sub noteswrapper { @@ -2827,6 +2852,7 @@ sub noteswrapper { return "$link"; } + # ------------------------------------------------------------- Aboutme Wrapper sub aboutmewrapper { @@ -2840,12 +2866,13 @@ sub aboutmewrapper { # ------------------------------------------------------------ Syllabus Wrapper - sub syllabuswrapper { my ($linktext,$coursedir,$domain)=@_; return qq{$linktext}; } +# ----------------------------------------------------------------------------- + sub track_student_link { my ($linktext,$sname,$sdom,$target,$start) = @_; my $link ="/adm/trackstudent?"; @@ -4492,6 +4519,7 @@ 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 = @@ -4606,6 +4634,18 @@ form, .inline { 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; } @@ -4678,6 +4718,10 @@ table#LC_nav_location { padding: 0px; } +table#LC_title_bar a { + color: $fontmenu; +} + table#LC_title_bar, table.LC_breadcrumbs, table#LC_title_bar.LC_with_remote { @@ -4686,6 +4730,7 @@ table#LC_title_bar.LC_with_remote { border-style: solid; border-width: $border; background: $pgbg; + color: $fontmenu; font-family: $sans; border-collapse: collapse; padding: 0px; @@ -4706,7 +4751,7 @@ table#LC_title_bar td { table#LC_title_bar .LC_title_bar_who { background: $tabbg; - color: $font; + color: $fontmenu; font: small $sans; text-align: right; margin: 0px; @@ -4771,7 +4816,7 @@ table#LC_top_nav td.LC_top_nav_login { table.LC_breadcrumbs td, table.LC_docs_path td { background: $tabbg; - color: $font; + color: $fontmenu; font-family: $sans; font-size: smaller; } @@ -4779,7 +4824,7 @@ table.LC_docs_path td { table.LC_breadcrumbs td.LC_breadcrumbs_component, table.LC_docs_path td.LC_docs_path_component { background: $tabbg; - color: $font; + color: $fontmenu; font-family: $sans; font-size: larger; text-align: right; @@ -4895,6 +4940,7 @@ 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%; } @@ -4942,6 +4988,7 @@ table.LC_nested tr.LC_empty_row td { table.LC_nested_outer tr th { font-weight: bold; + color:$fontmenu; background-color: $data_table_head; font-size: small; border-bottom: 1px solid #000000; @@ -5793,6 +5840,7 @@ h2,h3,h4,h5,h6 { padding:3px 15px 3px 15px; margin:0px; background-color:$tabbg; + color:$fontmenu; border-bottom:solid 1px $lg_border_color; } @@ -7469,12 +7517,17 @@ sub user_picker { if ($cancreate) { $new_user_create = '

&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" />

'; } else { - my $helplink = ' href="javascript:helpMenu('."'display'".')"'; + my $helplink = 'javascript:helpMenu('."'display'".')'; my %usertypetext = ( official => 'institutional', unofficial => 'non-institutional', ); - $new_user_create = '
'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the helpdesk for assistance.',$helplink).'

'; + $new_user_create = '

' + .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.") + .' ' + .&mt('Please contact the [_1]helpdesk[_2] for assistance.' + ,'','') + .'


'; } } }